Work with the latest version of pyinstaller. Bump version to v0.4.0

nithinphilips · Aug 17, 2015 · 5ee6ab6 · 5ee6ab6
1 parent c61f38a
commit 5ee6ab6
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-WINPYTHON=C:/Python27/python.exe
+WINPYTHON=C:/python27/Scripts/pyinstaller.exe
 
 winexe:
-	$(WINPYTHON) C:/Python27/pyinstaller-2.0/pyinstaller.py -y odel-runner.py
+	$(WINPYTHON) -y --onefile odel-runner.py
diff --git a/README.rst b/README.rst
diff --git a/odel/__init__.py b/odel/__init__.py
diff --git a/odel/__main__.py b/odel/__main__.py
diff --git a/odel/odel.py b/odel/odel.py
@@ -4,11 +4,12 @@
 """odel.odel: provides entry point main()."""
 
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 
 import argparse
 import logging
+import sys
 
 from argh import ArghParser, completion, set_default_command
 
@@ -21,6 +22,10 @@
                            action='store_true',
                            default=False,
                            help="Enable debug logging.")
+COMMON_PARSER.add_argument('--version',
+                           action='store_true',
+                           default=False,
+                           help="Print version information and quit.")
 
 def main():
     """Main application entrypoint"""
@@ -39,4 +44,30 @@ def main():
         # Cut down suds logs
         logging.getLogger('suds').setLevel(logging.WARNING)
 
+    if args.version:
+        print_version()
+        return
+
     parser.dispatch()
+
+
+def print_version():
+    sys.stdout.write(
+            "Odel. Tool to upload Data Integrator files to IBM Tririga.\n"
+            "Version {}\n"
+            "\n"
+            "Copyright (C) 2014 Nithin Philips\n"
+            "\n"
+            "This program is free software: you can redistribute it and/or modify\n"
+            "it under the terms of the GNU General Public License as published by\n"
+            "the Free Software Foundation, either version 3 of the License, or\n"
+            "(at your option) any later version.\n"
+            "\n"
+            "This program is distributed in the hope that it will be useful,\n"
+            "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+            "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+            "GNU General Public License for more details.\n"
+            "\n"
+            "You should have received a copy of the GNU General Public License\n"
+            "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n".format(__version__)
+    )
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -1,42 +1,42 @@
-# -*- coding: utf-8 -*-
-
-
-"""setup.py: setuptools control."""
-
-
-import re
-from setuptools import setup, find_packages
-
-
-version = re.search(
-    '^__version__\s*=\s*"(.*)"',
-    open('odel/odel.py').read(),
-    re.M
-    ).group(1)
-
-
-with open("README.rst", "rb") as f:
-    long_descr = f.read().decode("utf-8")
-
-
-setup(
-    name = "cmdline-odel",
-    packages = find_packages(exclude=['contrib', 'docs', 'tests*']),
-    entry_points = {
-        "console_scripts": ['odel = odel.odel:main']
-        },
-    install_requires = [
-        "argh",
-        "argcomplete",
-        "bunch",
-        "suds",
-        "requests",
-    ],
-    version = version,
-    description = "Odel uploads Data Integrator files to Tririga",
-    long_description = long_descr,
-    author = "Nithin Philips",
-    author_email = "[email protected]",
-    url = "",
-    test_suite="odel.tests",
-    )
+# -*- coding: utf-8 -*-
+
+
+"""setup.py: setuptools control."""
+
+
+import re
+from setuptools import setup, find_packages
+
+
+version = re.search(
+    '^__version__\s*=\s*"(.*)"',
+    open('odel/odel.py').read(),
+    re.M
+    ).group(1)
+
+
+with open("README.rst", "rb") as f:
+    long_descr = f.read().decode("utf-8")
+
+
+setup(
+    name = "cmdline-odel",
+    packages = find_packages(exclude=['contrib', 'docs', 'tests*']),
+    entry_points = {
+        "console_scripts": ['odel = odel.odel:main']
+        },
+    install_requires = [
+        "argh",
+        "argcomplete",
+        "bunch",
+        "suds",
+        "requests",
+    ],
+    version = version,
+    description = "Odel uploads Data Integrator files to Tririga",
+    long_description = long_descr,
+    author = "Nithin Philips",
+    author_email = "[email protected]",
+    url = "",
+    test_suite="odel.tests",
+    )
diff --git a/windows/Makefile b/windows/Makefile
@@ -4,7 +4,7 @@ PROGRAM=Odel
 
 CANDLE=candle
 LIGHT=light
-VERSION=0.3.0
+VERSION=0.4.0
 
 MSI_NAME="$(PROGRAM)-$(VERSION)"
 

diff --git a/windows/Odel.wxs b/windows/Odel.wxs
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-    <Product Name='Odel $(var.VERSION)' Id='6459a903-7cf6-452d-b7c8-3a84c12f0e0f' UpgradeCode='e146fcc6-847d-42a6-8117-d2bcdfd8304b'
+    <Product Name='Odel $(var.VERSION)' Id='32d115a7-3757-4cb8-b08a-530028abb1fb' UpgradeCode='e146fcc6-847d-42a6-8117-d2bcdfd8304b'
         Language='1033' Codepage='1252' Version='1.0.0' Manufacturer='Odel'>
 
         <Package Id='*' Keywords='Installer'
@@ -31,25 +31,7 @@
             <Directory Id='ProgramFilesFolder' Name='PFiles'>
                 <Directory Id='APPLICATIONFOLDER' Name='Odel'>
                     <Component Id='MainExecutable' Guid='77de8675-e836-4158-b672-435bc7bd58c6'>
-                        <File Id='odel.exe' Name='odel.exe' DiskId='1' Source='../dist/odel-runner/odel-runner.exe' KeyPath='yes' />
-                        <File Id='odel.exe.manifest' Name='odel.exe.manifest' DiskId='1' Source='../dist/odel-runner/odel-runner.exe.manifest'/>
-                        <File Id='_ctypes.pyd' DiskId='1' Source='../dist/odel-runner/_ctypes.pyd'/>
-                        <File Id='_hashlib.pyd' DiskId='1' Source='../dist/odel-runner/_hashlib.pyd'/>
-                        <File Id='_socket.pyd' DiskId='1' Source='../dist/odel-runner/_socket.pyd'/>
-                        <File Id='_ssl.pyd' DiskId='1' Source='../dist/odel-runner/_ssl.pyd'/>
-                        <File Id='bz2.pyd' DiskId='1' Source='../dist/odel-runner/bz2.pyd'/>
-                        <File Id='Microsoft.VC90.CRT.manifest' DiskId='1' Source='../dist/odel-runner/Microsoft.VC90.CRT.manifest'/>
-                        <File Id='msvcm90.dll' DiskId='1' Source='../dist/odel-runner/msvcm90.dll'/>
-                        <File Id='msvcp90.dll' DiskId='1' Source='../dist/odel-runner/msvcp90.dll'/>
-                        <File Id='msvcr90.dll' DiskId='1' Source='../dist/odel-runner/msvcr90.dll'/>
-                        <File Id='pyexpat.pyd' DiskId='1' Source='../dist/odel-runner/pyexpat.pyd'/>
-                        <File Id='python27.dll' DiskId='1' Source='../dist/odel-runner/python27.dll'/>
-                        <File Id='pywintypes27.dll' DiskId='1' Source='../dist/odel-runner/pywintypes27.dll'/>
-                        <File Id='select.pyd' DiskId='1' Source='../dist/odel-runner/select.pyd'/>
-                        <File Id='unicodedata.pyd' DiskId='1' Source='../dist/odel-runner/unicodedata.pyd'/>
-                        <File Id='win32api.pyd' DiskId='1' Source='../dist/odel-runner/win32api.pyd'/>
-                        <File Id='win32pipe.pyd' DiskId='1' Source='../dist/odel-runner/win32pipe.pyd'/>
-                        <File Id='win34wnet.pyd' DiskId='1' Source='../dist/odel-runner/win32wnet.pyd'/>
+                        <File Id='odel.exe' Name='odel.exe' DiskId='1' Source='../dist/odel-runner.exe' KeyPath='yes' />
                     </Component>
 
                     <Component Id="UpdatePathUser"