Update to Python 3.12

oldnapalm · Feb 15, 2024 · 624fe1b · 624fe1b
1 parent 7612d83
commit 624fe1b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/pyinstaller.yaml b/.github/workflows/pyinstaller.yaml
@@ -13,15 +13,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - uses: engineerd/[email protected]
       with:
         name: "upx.exe"
-        url: "https://github.com/upx/upx/releases/download/v4.2.1/upx-4.2.1-win64.zip"
-        pathInArchive: "upx-4.2.1-win64/upx.exe"
+        url: "https://github.com/upx/upx/releases/download/v4.2.2/upx-4.2.2-win64.zip"
+        pathInArchive: "upx-4.2.2-win64/upx.exe"
 
     - run: pip install -r requirements.txt
     - run: pyinstaller bot_editor.spec

diff --git a/bot_editor.spec b/bot_editor.spec
@@ -17,9 +17,6 @@ a = Analysis(['bot_editor.py'],
              win_private_assemblies=False,
              cipher=block_cipher,
              noarchive=False)
-a.binaries = [x for x in a.binaries
-              if not os.path.dirname(x[1]).lower().startswith("c:\\program files")
-              and not os.path.dirname(x[1]).lower().startswith("c:\\windows")]
 pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
@@ -32,6 +29,7 @@ exe = EXE(pyz,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
+          upx_exclude=['python3.dll', 'api-ms-win-*.dll'],
           runtime_tmpdir=None,
           console=True)
 

diff --git a/get_profile.spec b/get_profile.spec
@@ -17,9 +17,6 @@ a = Analysis(['get_profile.py'],
              win_private_assemblies=False,
              cipher=block_cipher,
              noarchive=False)
-a.binaries = [x for x in a.binaries
-              if not os.path.dirname(x[1]).lower().startswith("c:\\program files")
-              and not os.path.dirname(x[1]).lower().startswith("c:\\windows")]
 pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
@@ -32,6 +29,7 @@ exe = EXE(pyz,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
+          upx_exclude=['python3.dll', 'api-ms-win-*.dll'],
           runtime_tmpdir=None,
           console=True)
 

diff --git a/strava_auth.spec b/strava_auth.spec
@@ -17,9 +17,6 @@ a = Analysis(['strava_auth.py'],
              win_private_assemblies=False,
              cipher=block_cipher,
              noarchive=False)
-a.binaries = [x for x in a.binaries
-              if not os.path.dirname(x[1]).lower().startswith("c:\\program files")
-              and not os.path.dirname(x[1]).lower().startswith("c:\\windows")]
 pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
@@ -32,6 +29,7 @@ exe = EXE(pyz,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
+          upx_exclude=['python3.dll', 'api-ms-win-*.dll'],
           runtime_tmpdir=None,
           console=True)
 

diff --git a/upload_activity.spec b/upload_activity.spec
@@ -17,9 +17,6 @@ a = Analysis(['upload_activity.py'],
              win_private_assemblies=False,
              cipher=block_cipher,
              noarchive=False)
-a.binaries = [x for x in a.binaries
-              if not os.path.dirname(x[1]).lower().startswith("c:\\program files")
-              and not os.path.dirname(x[1]).lower().startswith("c:\\windows")]
 pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
@@ -32,6 +29,7 @@ exe = EXE(pyz,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
+          upx_exclude=['python3.dll', 'api-ms-win-*.dll'],
           runtime_tmpdir=None,
           console=True)