Clean up toward building with py2app or pyinstaller

pjkundert · pjkundert · commit 37cb28865fa0 · 2022-01-31T10:52:07.000-07:00
o make slip39[serial,json,gui] support optional
diff --git a/GNUmakefile b/GNUmakefile
@@ -19,6 +19,7 @@ help:
 	@echo "GNUmakefile for cpppo.  Targets:"
 	@echo "  help			This help"
 	@echo "  test			Run unit tests under Python3"
+	@echo "  build			Build dist packages under Python3"
 	@echo "  install		Install in /usr/local for Python3"
 	@echo "  clean			Remove build artifacts"
 	@echo "  upload			Upload new version to pypi (package maintainer only)"
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,6 +2,7 @@
 include LICENSE
 include COPYING
 include README.org
-include requirements.txt
-include requirements-tests.txt
+include README.pdf
+include README.txt
+include requirements*.txt
 global-exclude *~
diff --git a/README.org b/README.org
@@ -1035,8 +1035,9 @@ by entering the mnemonics right on the device.
 
 * Dependencies
 
-  Internally, python-slip39 project uses Trezor's [[https://gihub.com/trezor/python-shamir-mnemonic.git][python-shamir-mnemonic]] to encode the seed data,
-  and the Ethereum project's [[https://github.com/ethereum/eth-account][eth-account]] to convert seeds to Ethereum accounts.
+  Internally, python-slip39 project uses Trezor's [[https://gihub.com/trezor/python-shamir-mnemonic.git][python-shamir-mnemonic]] to encode the seed data to
+  SLIP-39 phrases, [[https://github.com/meherett/python-hdwallet.git][python-hdwallet]] to convert seeds to ETH, BTC, LTC and DOGE wallets, and the
+  Ethereum project's [[https://github.com/ethereum/eth-account][eth-account]] to produce encrypted JSON wallets for specified Ethereum accounts.
 
 ** The =python-shamir-mnemonic= API
 
diff --git a/README.txt b/README.txt
diff --git a/SLIP39.py b/SLIP39.py
@@ -0,0 +1,6 @@
+#! /usr/bin/env python3
+
+import sys
+from slip39.App.main import main
+
+sys.exit( main() )
diff --git a/images/SLIP39.icns b/images/SLIP39.icns
diff --git a/requirements-gui.txt b/requirements-gui.txt
@@ -0,0 +1,2 @@
+pysimplegui		>=4.56
+tkinter
diff --git a/requirements-json.txt b/requirements-json.txt
@@ -0,0 +1 @@
+eth-account		>=0.5,	<1
diff --git a/requirements-serial.txt b/requirements-serial.txt
@@ -0,0 +1 @@
+pyserial		>=3.5
diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,6 @@
-chacha20poly1305>=0.0.3
-fpdf2
-hdwallet
-mnemonic>=0.19,<1
-pyserial>=3.5
-pysimplegui
-qrcode
-shamir-mnemonic
+chacha20poly1305	>=0.0.3
+fpdf2			>=2.5,	<3
+hdwallet		>=2.1,	<3
+mnemonic		>=0.19,	<1
+qrcode			>=7.3
+shamir-mnemonic		>=0.2,	<1
diff --git a/setup.py b/setup.py
@@ -28,6 +28,14 @@
 
 install_requires		= open( os.path.join( HERE, "requirements.txt" )).readlines()
 tests_require			= open( os.path.join( HERE, "requirements-tests.txt" )).readlines()
+extras_require			= {
+    option: open( os.path.join( HERE, f"requirements-{option}.txt" )).readlines()
+    for option in [
+        'serial',	# slip39[serial]: Support serial I/O of generated wallet data
+        'json',		# slip39[json]:   Support output of encrypted Ethereum JSON wallets
+        'gui',		# slip39[gui]:    Support PySimpleGUI/tkinter graphical UI App
+    ]
+}
 
 package_dir			= {
     "slip39":			"./slip39",
@@ -160,11 +168,45 @@
 project_urls			= {
     "Bug Tracker": "https://github.com/pjkundert/python-slip39/issues",
 }
+
+# For py2{app,exe} App Generation
+mainscript			= "SLIP39.py"
+
+if sys.platform == 'darwin':
+    extra_options		= dict(
+        setup_requires	= [ 'py2app' ],
+        app		= [ mainscript ],
+        # Cross-platform applications generally expect sys.argv to
+        # be used for opening files.
+        # Don't use this with GUI toolkits, the argv
+        # emulator causes problems and toolkits generally have
+        # hooks for responding to file-open events.
+        options		= dict(
+            py2app	= dict(
+                argv_emulation	= True,
+                iconfile	= 'images/SLIP39.icns',
+                includes	= 'tkinter',
+            ),
+        ),
+    )
+elif sys.platform == 'win32':
+    extra_options		= dict(
+        setup_requires	= [ 'py2exe' ],
+        app		= [ mainscript ],
+    )
+else:
+    extra_options		= dict(
+        # Normally unix-like platforms will use "setup.py install"
+        # and install the main script as such
+        scripts		= [ mainscript ],
+    )
+
 setup(
     name			= "slip39",
     version			= __version__,
-    tests_require		= tests_require,
     install_requires		= install_requires,
+    tests_require		= tests_require,
+    extras_require		= extras_require,
     packages			= package_dir.keys(),
     package_dir			= package_dir,
     zip_safe			= True,
@@ -180,4 +222,5 @@
     url				= "https://github.com/pjkundert/python-slip39",
     classifiers			= classifiers,
     python_requires		= ">=3.9",
+    **extra_options
 )
diff --git a/slip39/App/main.py b/slip39/App/main.py
@@ -155,6 +155,8 @@ def app(
         status			= None
         event, values		= window.read()
         logging.info( f"{event}, {values}" )
+        if not values:
+            continue
 
         if '-TARGET-' in values:
             # A target directory has been selected;
@@ -168,7 +170,7 @@ def app(
         if event == '+':
             g			= len(groups)
             name		= f"Group {g+1}"
-            needs		= (1,2)
+            needs		= (2,3)
             groups[name] 	= needs
             window.extend_layout( window['-GROUP-NUMBER-'], [[ sg.Text(  f"{g+1}",                          **T_kwds ) ]] )  # noqa: 241
             window.extend_layout( window['-GROUP-NAMES-'],  [[ sg.Input( f"{name}",     key=f"-G-NAME-{g}", **I_kwds ) ]] )  # noqa: 241
@@ -183,6 +185,7 @@ def app(
             logging.exception( f"{status}" )
             continue
 
+        # Collect up the specified Group names; ignores groups with an empty name
         g_rec			= {}
         status			= None
         for g in range( 16 ):
@@ -191,7 +194,9 @@ def app(
                 break
             grp			= '?'
             try:
-                grp		= str( values[grp_idx] )
+                grp		= str( values[grp_idx] ).strip()
+                if not grp:
+                    continue
                 g_rec[grp] 	= int( values[f"-G-NEED-{g}"] or 0 ), int( values[f"-G-SIZE-{g}"] or 0 )
             except Exception as exc:
                 status		= f"Error defining group {g+1} {grp!r}: {exc}"
@@ -207,7 +212,7 @@ def app(
         names			= [
             name.strip()
             for name in values['-NAMES-'].split( ',' )
-            if name
+            if name and name.strip()
         ]
         details			= {}
         try:
