Version bumps

.gitignore

@@ -1,4 +1,5 @@
 .idea/
+.DS_Store
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -83,6 +84,7 @@ celerybeat-schedule
 # virtualenv
 venv/
 ENV/
+.venv
 
 # Spyder project settings
 .spyderproject

Main.py

@@ -18,7 +18,7 @@ import locale
 # see https://discuss.wxpython.org/t/wxpython4-1-1-python3-8-locale-wxassertionerror/35168
 locale.setlocale(locale.LC_ALL, 'C')
 
-__version__ = "5.0.0"
+__version__ = "5.1.0"
 __flash_help__ = '''
 <p>This setting is highly dependent on your device!<p>
 <p>

build-on-mac.spec

@@ -1,31 +1,51 @@
-# -*- mode: python -*-
+# -*- mode: python ; coding: utf-8 -*-
 
-block_cipher = None
 
-a = Analysis(['nodemcu-pyflasher.py'],
+a = Analysis(
-             binaries=None,
+    ['nodemcu-pyflasher.py'],
-             datas=[("images", "images")],
+    pathex=[],
-             hiddenimports=[],
+    binaries=[],
-             hookspath=[],
+    datas=[("images", "images")],
-             runtime_hooks=[],
+    hiddenimports=[],
-             excludes=[],
+    hookspath=[],
-             win_no_prefer_redirects=False,
+    hooksconfig={},
-             win_private_assemblies=False,
+    runtime_hooks=[],
-             cipher=block_cipher)
+    excludes=[],
-pyz = PYZ(a.pure, a.zipped_data,
+    noarchive=False,
-             cipher=block_cipher)
+    optimize=0,
-exe = EXE(pyz,
+)
-          a.scripts,
+pyz = PYZ(a.pure)
-          a.binaries,
+
-          a.zipfiles,
+exe = EXE(
-          a.datas,
+    pyz,
-          name='NodeMCU PyFlasher',
+    a.scripts,
-          debug=False,
+    [],
-          strip=False,
+    exclude_binaries=True,
-          upx=True,
+    name='NodeMCU PyFlasher',
-          console=False , icon='images/icon-256.icns')
+    debug=False,
-app = BUNDLE(exe,
+    bootloader_ignore_signals=False,
-             name='NodeMCU PyFlasher.app',
+    strip=False,
-             version='5.0.0',
+    upx=True,
-             icon='./images/icon-256.icns',
+    console=False,
-             bundle_identifier='com.frightanic.nodemcu-pyflasher')
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='NodeMCU PyFlasher',
+    icon='images/icon-256.icns'
+)
+app = BUNDLE(
+    coll,
+    name='NodeMCU PyFlasher.app',
+    version='5.1.0',
+    icon='images/icon-256.icns',
+    bundle_identifier='com.frightanic.nodemcu-pyflasher')

build-on-win.spec

@@ -1,28 +1,40 @@
-# -*- mode: python -*-
+# -*- mode: python ; coding: utf-8 -*-
 
-block_cipher = None
 
-a = Analysis(['nodemcu-pyflasher.py'],
+a = Analysis(
-             binaries=[],
+    ['nodemcu-pyflasher.py'],
-             datas=[("images", "images")],
+    pathex=[],
-             hiddenimports=[],
+    binaries=[],
-             hookspath=[],
+    datas=[("images", "images")],
-             runtime_hooks=[],
+    hiddenimports=[],
-             excludes=[],
+    hookspath=[],
-             win_no_prefer_redirects=False,
+    hooksconfig={},
-             win_private_assemblies=False,
+    runtime_hooks=[],
-             cipher=block_cipher)
+    excludes=[],
-pyz = PYZ(a.pure, a.zipped_data,
+    noarchive=False,
-             cipher=block_cipher)
+    optimize=0,
-exe = EXE(pyz,
+)
-          a.scripts,
+pyz = PYZ(a.pure)
-          a.binaries,
+
-          a.zipfiles,
+exe = EXE(
-          a.datas,
+    pyz,
-          name='NodeMCU-PyFlasher',
+    a.scripts,
-          version='windows-version-info.txt',
+    a.binaries,
-          debug=False,
+    a.datas,
-          strip=False,
+    [],
-          upx=True,
+    name='NodeMCU-PyFlasher',
-          console=False,
+    version='windows-version-info.txt',
-          icon='images\\icon-256.ico')
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=False,
+    icon='images\\icon-256.ico',
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)

build.bat

@@ -1,4 +1,3 @@
 pyinstaller --log-level=DEBUG ^
             --noconfirm ^
-            --windowed ^
             build-on-win.spec

build.sh

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 # rm -fr build dist
-VERSION=5.0.0
+VERSION=5.1.0
 NAME="NodeMCU PyFlasher"
 DIST_NAME="NodeMCU-PyFlasher"
 
 pyinstaller --log-level=DEBUG \
             --noconfirm \
-            --windowed \
             build-on-mac.spec
 
 # https://github.com/sindresorhus/create-dmg

requirements.txt

@@ -1,6 +1,9 @@
-esptool>=3.0
+# Can't use v4 atm, see https://github.com/marcelstoer/nodemcu-pyflasher/issues/105
+esptool==3.3.3
 pyserial~=3.5
-wxPython~=4.1.1
+# https://github.com/wxWidgets/Phoenix/issues/2499 prevents the use of 4.2.1.
-PyInstaller~=4.8
+# 4.2.0 requires Python <=3.10 apparently.
+wxPython==4.2.0
+PyInstaller==6.9.0
 httplib2>=0.18.1
 pyinstaller-versionfile>=2.0.0

windows-metadata.yaml

@@ -1,6 +1,6 @@
 # https://github.com/DudeNr33/pyinstaller-versionfile
 # create-version-file windows-metadata.yaml --outfile windows-version-info.txt
-Version: 5.0.0
+Version: 5.1.0
 CompanyName: Marcel Stör
 FileDescription: NodeMCU PyFlasher
 InternalName: NodeMCU PyFlasher

windows-version-info.txt

@@ -9,8 +9,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0. Must always contain 4 elements.
-    filevers=(5,0,0,0),
+    filevers=(5,1,0,0),
-    prodvers=(5,0,0,0),
+    prodvers=(5,1,0,0),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -34,12 +34,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u'Marcel Stör'),
         StringStruct(u'FileDescription', u'NodeMCU PyFlasher'),
-        StringStruct(u'FileVersion', u'5.0.0.0'),
+        StringStruct(u'FileVersion', u'5.1.0.0'),
         StringStruct(u'InternalName', u'NodeMCU PyFlasher'),
         StringStruct(u'LegalCopyright', u'© Marcel Stör. All rights reserved.'),
         StringStruct(u'OriginalFilename', u'NodeMCU-PyFlasher.exe'),
         StringStruct(u'ProductName', u'NodeMCU PyFlasher'),
-        StringStruct(u'ProductVersion', u'5.0.0.0')])
+        StringStruct(u'ProductVersion', u'5.1.0.0')])
       ]), 
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]