Merge branch 'feature-win32-v11'; v11.2.0

Author: pjkundert

SLIP-39-macOS.spec

@@ -55,15 +55,15 @@ app = BUNDLE(
     exe,
     name='SLIP-39.app',
     icon='images/SLIP-39.icns',
-    version='11.1.2',
+    version='11.2.0',
     info_plist={
         'NSPrincipalClass': 'NSApplication',
         'NSAppleScriptEnabled': False,
         'LSBackgroundOnly': False,
         'NSRequiresAquaSystemAppearance': 'No',
         'CFBundleSupportedPlatforms': ['MacOSX'],
         'CFBundleIdentifier': 'ca.kundert.perry.SLIP39',
-        'CFBundleVersion':'11.1.2',
+        'CFBundleVersion':'11.2.0',
         'CFBundlePackageType':'APPL',
         'LSApplicationCategoryType':'public.app-category.utilities',
         'LSMinimumSystemVersion':'10.15',

SLIP-39-win32.spec

@@ -5,41 +5,48 @@ datas = []
 datas += collect_data_files('shamir_mnemonic')
 datas += collect_data_files('slip39')
 
-
 block_cipher = None
 
+a = Analysis(
+    ['SLIP-39.py'],
+    pathex=[],
+    binaries=[],
+    datas=datas,
+    hiddenimports=['slip39'],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
 
-a = Analysis(['SLIP-39.py'],
-             pathex=[],
-             binaries=[],
-             datas=datas,
-             hiddenimports=['slip39'],
-             hookspath=[],
-             hooksconfig={},
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
+pyz = PYZ(
+    a.pure,
+    a.zipped_data,
+    cipher=block_cipher,
+)
 
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,  
-          [],
-          name='SLIP-39',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          upx_exclude=[],
-          runtime_tmpdir=None,
-          console=False,
-          disable_windowed_traceback=False,
-          target_arch=None,
-          codesign_identity=None,
-          entitlements_file=None )
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,  
+    [],
+    name='SLIP-39',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)

setup.py

@@ -10,19 +10,20 @@
 
 install_requires		= open( os.path.join( HERE, "requirements.txt" )).readlines()
 tests_require			= open( os.path.join( HERE, "requirements-tests.txt" )).readlines()
+options_require			= [
+        'gui',		# slip39[gui]:		Support PySimpleGUI/tkinter Graphical UI App
+        'serial',	# slip39[serial]:	Support serial I/O of generated wallet data
+        'wallet',	# slip39[wallet]:	Paper Wallet and BIP-38/Ethereum wallet encryption
+      # 'invoice',	# slip39[invoice]:	Generation of invoices, and associated Smart Contracts
+]
 extras_require			= {
     option: list(
         # Remove whitespace, elide blank lines and comments
         ''.join( r.split() )
         for r in open( os.path.join( HERE, f"requirements-{option}.txt" )).readlines()
         if r.strip() and not r.strip().startswith( '#' )
     )
-    for option in [
-        'gui',		# slip39[gui]:		Support PySimpleGUI/tkinter Graphical UI App
-        'serial',	# slip39[serial]:	Support serial I/O of generated wallet data
-        'wallet',	# slip39[wallet]:	Paper Wallet and BIP-38/Ethereum wallet encryption
-        'invoice',	# slip39[invoice]:	Generation of invoices, and associated Smart Contracts
-    ]
+    for option in options_require
 }
 # Make python-slip39[all] install all extra (non-tests) requirements, excluding duplicates
 extras_require['all']		= list( set( sum( extras_require.values(), [] )))

slip39/version.py

@@ -1,2 +1,2 @@
-__version_info__		= ( 11, 1, 2 )
+__version_info__		= ( 11, 2, 0 )
 __version__			= '.'.join( map( str, __version_info__ ))