wxPython paths changed, build it without depending on a path that cha…

…nges frequently.

.github/workflows/main.yml

@@ -39,9 +39,15 @@ jobs:
         run: .\myenv\Scripts\Activate.ps1
         shell: powershell
 
-      - name: Install wxPython
-        run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp310-cp310-win_amd64.whl
-
+      - name: Install wxPython and build
+        run: |
+          python -m venv myenv
+          .\myenv\Scripts\Activate.ps1
+          python --version
+          pip install -U pip
+          pip install -U six wheel setuptools
+          pip install -U -f https://extras.wxpython.org/wxPython4/extras/4.2.1 wxPython
+        shell: powershell
 
       - name: Install requirements
         run: pip install -r requirements.txt
@@ -85,9 +91,15 @@ jobs:
         run: .\myenv\Scripts\Activate.ps1
         shell: powershell
 
-      - name: Install wxPython
-        run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp38-cp38-win_amd64.whl
-
+      - name: Install wxPython and build
+        run: |
+          python -m venv myenv
+          .\myenv\Scripts\Activate.ps1
+          python --version
+          pip install -U pip
+          pip install -U six wheel setuptools
+          pip install -U -f https://extras.wxpython.org/wxPython4/extras/4.2.1 wxPython
+        shell: powershell
 
       - name: Install requirements
         run: pip install -r requirements.txt

.github/workflows/windows_2019.yml

@@ -29,10 +29,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          # python-version: '3.7'
           python-version: '3.8'
-          # python-version: '3.9'
-          # python-version: '3.10'
 
       - name: Create virtual environment
         run: python -m venv myenv
@@ -42,13 +39,15 @@ jobs:
         run: .\myenv\Scripts\Activate.ps1
         shell: powershell
 
-      - name: Install wxPython
-        # run: pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.1.0-cp38-cp38-linux_x86_64.whl
-        # run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp37-cp37m-win_amd64.whl
-        run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp38-cp38-win_amd64.whl
-        # run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp39-cp39-win_amd64.whl
-        # run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp310-cp310-win_amd64.whl
-
+      - name: Install wxPython and build
+        run: |
+          python -m venv myenv
+          .\myenv\Scripts\Activate.ps1
+          python --version
+          pip install -U pip
+          pip install -U six wheel setuptools
+          pip install -U -f https://extras.wxpython.org/wxPython4/extras/4.2.1 wxPython
+        shell: powershell
 
       - name: Install requirements
         run: pip install -r requirements.txt

.github/workflows/windows_2022.yml

@@ -29,9 +29,6 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          # python-version: '3.7'
-          # python-version: '3.8'
-          # python-version: '3.9'
           python-version: '3.10'
 
       - name: Create virtual environment
@@ -42,13 +39,15 @@ jobs:
         run: .\myenv\Scripts\Activate.ps1
         shell: powershell
 
-      - name: Install wxPython
-        # run: pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.1.0-cp38-cp38-linux_x86_64.whl
-        # run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp37-cp37m-win_amd64.whl
-        # run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp38-cp38-win_amd64.whl
-        # run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp39-cp39-win_amd64.whl
-        run: pip install https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.2.1a1.dev5564+33cabe97-cp310-cp310-win_amd64.whl
-
+      - name: Install wxPython and build
+        run: |
+          python -m venv myenv
+          .\myenv\Scripts\Activate.ps1
+          python --version
+          pip install -U pip
+          pip install -U six wheel setuptools
+          pip install -U -f https://extras.wxpython.org/wxPython4/extras/4.2.1 wxPython
+        shell: powershell
 
       - name: Install requirements
         run: pip install -r requirements.txt

build-on-mac.spec

@@ -28,6 +28,6 @@ exe = EXE(pyz,
           icon='images/icon-256.icns')
 app = BUNDLE(exe,
              name='PixelFlasher.app',
-             version='5.3.1.0',
+             version='5.3.1.1',
              icon='./images/icon-256.icns',
              bundle_identifier='com.badabing.pixelflasher')

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 rm -rf build dist
-VERSION=5.3.1.0
+VERSION=5.3.1.1
 NAME="PixelFlasher"
 DIST_NAME="PixelFlasher"
 

constants.py

@@ -2,7 +2,7 @@
 
 APPNAME = 'PixelFlasher'
 CONFIG_FILE_NAME = 'PixelFlasher.json'
-VERSION = '5.3.1.0'
+VERSION = '5.3.1.1'
 SDKVERSION = '33.0.3'
 WIDTH = 1400
 HEIGHT = 1040

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.3.1.0
+Version: 5.3.1.1
 FileDescription: PixelFlasher
 InternalName: PixelFlasher
 OriginalFilename: PixelFlasher.exe

windows-version-info.txt

@@ -7,8 +7,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,3,1,0),
-    prodvers=(5,3,1,0),
+    filevers=(5,3,1,1),
+    prodvers=(5,3,1,1),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -32,12 +32,12 @@ VSVersionInfo(
         u'040904B0',
         [StringStruct(u'CompanyName', u''),
         StringStruct(u'FileDescription', u'PixelFlasher'),
-        StringStruct(u'FileVersion', u'5.3.1.0'),
+        StringStruct(u'FileVersion', u'5.3.1.1'),
         StringStruct(u'InternalName', u'PixelFlasher'),
         StringStruct(u'LegalCopyright', u''),
         StringStruct(u'OriginalFilename', u'PixelFlasher.exe'),
         StringStruct(u'ProductName', u'PixelFlasher'),
-        StringStruct(u'ProductVersion', u'5.3.1.0')])
+        StringStruct(u'ProductVersion', u'5.3.1.1')])
       ]),
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]