From f22d7857a0b8c10c24eccb583d7b048fc724da0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20St=C3=B6r?= Date: Sun, 14 Jul 2024 22:19:07 +0200 Subject: [PATCH] Version bumps --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 2 + Main.py | 2 +- build-on-mac.spec | 78 ++++++++++++++++++++++++--------------- build-on-win.spec | 64 +++++++++++++++++++------------- build.bat | 1 - build.sh | 3 +- requirements.txt | 9 +++-- windows-metadata.yaml | 2 +- windows-version-info.txt | 8 ++-- 10 files changed, 102 insertions(+), 67 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 792a8cd9d661a39554f6a13352f0fc40a110c87e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOKQVF43(Nt4B2Fvs*@T%eycA<*E3>E5fJt4Hh8hd^+=33L;lKzcJ8 zy)k|Z%MuZ7zxP{_wTLuuL;0~VH9I$-*i&W{2*(|tG9329$9vy@O{#AvjQcDnIm??I z@8I9Qm02o41*iZOpaN82P66w^ux1s=NCl_>6}Tv1--iM>tchcwe>xC+1OP6PcEj3d z31G1VuqKXy$iOtHz@Tc57#eisOV-uIF)-+&Iech7S#v^Be>(0jUM^Y#8L0pjxK>~h z+qL!o7x>Kle@)_!3Q&QEQb3p8u50m1*;^+sXT7$-U*T5s3pc~sDG1(a>v39)i cqNppj#(7N~1D%e%(}DaMFkNU=;J+341326jdH?_b diff --git a/.gitignore b/.gitignore index e8ace72..bc5d84c 100644 --- a/.gitignore +++ b/.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 diff --git a/Main.py b/Main.py index b58a0d0..3064de6 100644 --- a/Main.py +++ b/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__ = '''

This setting is highly dependent on your device!

diff --git a/build-on-mac.spec b/build-on-mac.spec index a6fb593..73111e8 100644 --- a/build-on-mac.spec +++ b/build-on-mac.spec @@ -1,31 +1,51 @@ -# -*- mode: python -*- +# -*- mode: python ; coding: utf-8 -*- -block_cipher = None -a = Analysis(['nodemcu-pyflasher.py'], - binaries=None, - datas=[("images", "images")], - hiddenimports=[], - hookspath=[], - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - 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='NodeMCU PyFlasher', - debug=False, - strip=False, - upx=True, - console=False , icon='images/icon-256.icns') -app = BUNDLE(exe, - name='NodeMCU PyFlasher.app', - version='5.0.0', - icon='./images/icon-256.icns', - bundle_identifier='com.frightanic.nodemcu-pyflasher') +a = Analysis( + ['nodemcu-pyflasher.py'], + pathex=[], + binaries=[], + datas=[("images", "images")], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, + optimize=0, +) +pyz = PYZ(a.pure) + +exe = EXE( + pyz, + a.scripts, + [], + exclude_binaries=True, + name='NodeMCU PyFlasher', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=False, + 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') diff --git a/build-on-win.spec b/build-on-win.spec index bafbaa6..6d17b6e 100644 --- a/build-on-win.spec +++ b/build-on-win.spec @@ -1,28 +1,40 @@ -# -*- mode: python -*- +# -*- mode: python ; coding: utf-8 -*- -block_cipher = None -a = Analysis(['nodemcu-pyflasher.py'], - binaries=[], - datas=[("images", "images")], - hiddenimports=[], - hookspath=[], - runtime_hooks=[], - excludes=[], - win_no_prefer_redirects=False, - win_private_assemblies=False, - 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='NodeMCU-PyFlasher', - version='windows-version-info.txt', - debug=False, - strip=False, - upx=True, - console=False, - icon='images\\icon-256.ico') +a = Analysis( + ['nodemcu-pyflasher.py'], + pathex=[], + binaries=[], + datas=[("images", "images")], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, + optimize=0, +) +pyz = PYZ(a.pure) + +exe = EXE( + pyz, + a.scripts, + a.binaries, + a.datas, + [], + name='NodeMCU-PyFlasher', + version='windows-version-info.txt', + 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, +) diff --git a/build.bat b/build.bat index 04fc46f..8749fba 100755 --- a/build.bat +++ b/build.bat @@ -1,4 +1,3 @@ pyinstaller --log-level=DEBUG ^ --noconfirm ^ - --windowed ^ build-on-win.spec diff --git a/build.sh b/build.sh index 3d1f8ee..2e17821 100755 --- a/build.sh +++ b/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 diff --git a/requirements.txt b/requirements.txt index cc04c8c..ce5f586 100644 --- a/requirements.txt +++ b/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 -PyInstaller~=4.8 +# https://github.com/wxWidgets/Phoenix/issues/2499 prevents the use of 4.2.1. +# 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 diff --git a/windows-metadata.yaml b/windows-metadata.yaml index 6b5fdc1..02bb504 100644 --- a/windows-metadata.yaml +++ b/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 diff --git a/windows-version-info.txt b/windows-version-info.txt index bde9c14..0ef4e3e 100644 --- a/windows-version-info.txt +++ b/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), - prodvers=(5,0,0,0), + filevers=(5,1,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])]) ]