Merge pull request #1013 from henrykironde/build

Repair builds
weecology · Oct 24, 2017 · b57876d · b57876d
2 parents 1a0edaa + acb3e81
commit b57876d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 27 deletions.
diff --git a/pyinstaller.spec b/pyinstaller.spec
@@ -5,7 +5,7 @@ import distutils.util
 platform = distutils.util.get_platform()
 block_cipher = None
 
-a = Analysis(['__main__.py'],
+a = Analysis([os.path.normpath('retriever/__main__.py')],
              pathex=['.', 'lib','engines', 'scripts'],
              binaries=[],
              datas=[],
@@ -18,16 +18,18 @@ a = Analysis(['__main__.py'],
              win_private_assemblies=False,
              cipher=block_cipher)
 
-a.pure += [('retriever.engines.mysql','engines/mysql.py','PYMODULE'),
-           ('retriever.engines.postgres','engines/postgres.py', 'PYMODULE'),
-           ('retriever.engines.sqlite','engines/sqlite.py', 'PYMODULE'),
-           ('retriever.engines.msaccess','engines/msaccess.py', 'PYMODULE'),
-           ('retriever.engines.csvengine','engines/csvengine.py', 'PYMODULE'),
-           ('retriever.engines.download_only','engines/download_only.py', 'PYMODULE'),
-           ('retriever.engines.jsonengine','engines/jsonengine.py', 'PYMODULE'),
-           ('retriever.engines.xmlengine','engines/xmlengine.py', 'PYMODULE'),
-           ('retriever.lib.templates', 'lib/templates.py', 'PYMODULE'),
-           ('retriever.lib.excel', 'lib/excel.py', 'PYMODULE')]
+a.pure += [('retriever.engines.mysql','retriever/engines/mysql.py','PYMODULE'),
+           ('retriever.engines.postgres','retriever/engines/postgres.py', 'PYMODULE'),
+           ('retriever.engines.sqlite','retriever/engines/sqlite.py', 'PYMODULE'),
+           ('retriever.engines.msaccess','retriever/engines/msaccess.py', 'PYMODULE'),
+           ('retriever.engines.csvengine','retriever/engines/csvengine.py', 'PYMODULE'),
+           ('retriever.engines.download_only','retriever/engines/download_only.py', 'PYMODULE'),
+           ('retriever.engines.jsonengine','retriever/engines/jsonengine.py', 'PYMODULE'),
+           ('retriever.engines.xmlengine','retriever/engines/xmlengine.py', 'PYMODULE'),
+           ('retriever.lib.templates', 'retriever/lib/templates.py', 'PYMODULE'),
+           ('retriever.lib.excel', 'retriever/lib/excel.py', 'PYMODULE'),
+           ('retriever.lib.dummy', 'retriever/lib/dummy.py', 'PYMODULE')
+           ]
 
 pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)

diff --git a/setup.py b/setup.py
@@ -5,12 +5,12 @@
 import platform
 
 from pkg_resources import parse_version
-from setuptools import setup
+from setuptools import setup, find_packages
 
 current_platform = platform.system().lower()
 extra_includes = []
 if current_platform == "windows":
-    extra_includes = ["pypyodbc"]
+    extra_includes += ["pypyodbc"]
 
 if os.path.exists(".git/hooks"):  # check if we are in git repo
     os.system("cp hooks/pre-commit .git/hooks/pre-commit")
@@ -25,13 +25,6 @@
 def clean_version(v):
     return parse_version(v).__repr__().lstrip("<Version('").rstrip("')>")
 
-
-packages = [
-    'retriever.lib',
-    'retriever.engines',
-    'retriever',
-]
-
 includes = [
                'xlrd',
                'future',
@@ -63,10 +56,13 @@ def clean_version(v):
                    'Programming Language :: Python',
                    'Programming Language :: Python :: 2',
                    'Programming Language :: Python :: 3', ],
-      packages=packages,
-      package_dir={
-          'retriever': 'retriever'
-      },
+      packages=find_packages(
+          exclude=['hooks',
+                   'docs',
+                   'tests',
+                   'scripts',
+                   'docker',
+                   ".cache"]),
       entry_points={
           'console_scripts': [
               'retriever = retriever.__main__:main',
@@ -77,9 +73,6 @@ def clean_version(v):
           'future',
           'argcomplete'
       ],
-
-      # py2app flags
-      app=['__main__.py'],
       data_files=[('', ['CITATION'])],
       setup_requires=[],
       )