From 624fe1b4225b5b3da1cd16094c093948d0db0945 Mon Sep 17 00:00:00 2001 From: oldnapalm <38410858+oldnapalm@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:29:58 -0300 Subject: [PATCH] Update to Python 3.12 --- .github/workflows/pyinstaller.yaml | 8 ++++---- bot_editor.spec | 4 +--- get_profile.spec | 4 +--- strava_auth.spec | 4 +--- upload_activity.spec | 4 +--- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pyinstaller.yaml b/.github/workflows/pyinstaller.yaml index 3669061..c5602a1 100644 --- 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/configurator@v0.0.10 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 index f066a84..be9f958 100644 --- 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 index 6ef0b20..730af3d 100644 --- 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 index e248b83..a2b4d0f 100644 --- 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 index be064e3..02c7055 100644 --- 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)