Add a bin/sgr executable and use that as the PyInstaller entry point.

Author: mildbyte

.travis.yml

@@ -136,6 +136,7 @@ jobs:
         - if [ "$TRAVIS_OS_NAME" == "windows" ]; then export EXTENSION=".exe"; fi
         - export BINARY_OUTPUT=sgr-"$TRAVIS_OS_NAME"-"$TRAVIS_CPU_ARCH""$EXTENSION"
         - mv dist/sgr"$EXTENSION" dist/"$BINARY_OUTPUT"
+        - ls -lah dist/"$BINARY_OUTPUT"
       before_deploy: &before_deploy
         - echo "before_deploy"
       deploy: &deploy
@@ -145,6 +146,7 @@ jobs:
         file: dist/${BINARY_OUTPUT}
         skip_cleanup: true
         draft: true
+        overwrite: true
         on:
           repo: splitgraph/splitgraph
           tags: true

bin/sgr

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+from splitgraph.commandline import cli
+
+cli()

splitgraph.spec

@@ -2,48 +2,22 @@
 # Running:
 # * pyinstaller -F splitgraph.spec produces a single sgr binary in the dist/ folder
 #   with libc being the only dynamic dependency (python interpreter included)
-# * can also do poetry install && poetry run -F splitgraph.spec to build the binary inside of the poetry's venv.
+# * can also do poetry install && poetry run pyinstaller -F splitgraph.spec to build the binary inside of the poetry's venv.
 
 block_cipher = None
 
-# per https://github.com/pyinstaller/pyinstaller/wiki/Recipe-Setuptools-Entry-Point
-def Entrypoint(dist, group, name, **kwargs):
-    import pkg_resources
-
-    # get toplevel packages of distribution from metadata
-    def get_toplevel(dist):
-        distribution = pkg_resources.get_distribution(dist)
-        if distribution.has_metadata('top_level.txt'):
-            return list(distribution.get_metadata('top_level.txt').split())
-        else:
-            return []
-
-    kwargs.setdefault('hiddenimports', [])
-    packages = []
-    for distribution in kwargs['hiddenimports']:
-        packages += get_toplevel(distribution)
-
-    kwargs.setdefault('pathex', [])
-    # get the entry point
-    ep = pkg_resources.get_entry_info(dist, group, name)
-    # insert path of the egg at the verify front of the search path
-    kwargs['pathex'] = [ep.dist.location] + kwargs['pathex']
-    # script name must not be a valid module name to avoid name clashes on import
-    script_path = os.path.join(workpath, name + '-script.py')
-    print("creating script for entry point", dist, group, name)
-    with open(script_path, 'w') as fh:
-        print("import", ep.module_name, file=fh)
-        print("%s.%s()" % (ep.module_name, '.'.join(ep.attrs)), file=fh)
-        for package in packages:
-            print("import", package, file=fh)
+a = Analysis(['bin/sgr'],
+             pathex=['.'],
+             hiddenimports=[],
+             # Disable ingestion extras for now (we're looking at replacing this
+             # with something more lightweight)
+             excludes=['pandas','numpy','scipy', 'sqlalchemy'],
+             hookspath=[],
+             runtime_hooks=[],
+             cipher=block_cipher)
 
-    return Analysis(
-        [script_path] + kwargs.get('scripts', []),
-        **kwargs
-    )
+a.datas += Tree('./splitgraph/resources', 'splitgraph/resources')
 
-a = Entrypoint('splitgraph', 'console_scripts', 'sgr',
-    datas=[('splitgraph/resources', 'splitgraph/resources')])  # Add the resources folder with the audit trigger
 pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 exe = EXE(pyz,
@@ -59,4 +33,3 @@ exe = EXE(pyz,
           upx=True,
           runtime_tmpdir=None,
           console=True )
-