python 3.12

zarath · Feb 12, 2024 · ca9bead · ca9bead
1 parent 5562159
commit ca9bead
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml
@@ -19,22 +19,22 @@ jobs:
       run: |
         sudo add-apt-repository ppa:deadsnakes/ppa
         sudo apt-get update
-        sudo apt install -y python3.11 python3-pip python3.11-venv \
-          python3.11-dev \
+        sudo apt install -y python3.12 python3-pip python3.12-venv \
+          python3.12-dev \
           '^libxcb.*-dev' libx11-xcb-dev \
           libglu1-mesa-dev libxrender-dev libxi-dev \
           libxkbcommon-dev libxkbcommon-x11-dev
     - name: Install dependencies and pyinstall
       run: |
-        python3.11 -m venv build
+        python3.12 -m venv build
         . build/bin/activate
-        python3.11 -m pip install pip==24.0 setuptools==69.0.3
+        python3 -m pip install pip==24.0 setuptools==69.0.3
         pip install -r requirements.txt
         pip install PyInstaller==6.4.0 pyinstaller-hooks-contrib==2024.1
     - name: Build binary
       run: |
         . build/bin/activate
-        python3.11 setup.py -V
+        python3 setup.py -V
         pyinstaller --onefile \
           -p src \
           -n nanovna-saver \

diff --git a/.github/workflows/release_win.yml b/.github/workflows/release_win.yml
@@ -20,18 +20,16 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.11
+        python-version: 3.12
         architecture: ${{ matrix.arch }}
     - name: Install dependencies and pyinstall
       run: |
         python3 -m venv venv
         .\venv\Scripts\activate
-        python3 -m pip install pip==23.3.2
+        python3 -m pip install pip==24.0
         python3 -m pip install -U setuptools setuptools-scm
         python3 -m pip install -r requirements.txt
-        python3 -m pip install PyInstaller==6.3.0
-        python3 -m pip uninstall -y PyQt6-sip
-        python3 -m pip install PyQt6-sip==13.6.0
+        python3 -m pip install PyInstaller==6.4.0
     - name: Build binary
       run: |
         .\venv\Scripts\activate
@@ -42,8 +40,8 @@ jobs:
           -i icon_48x48.ico `
           -p src `
           -n nanovna-saver.exe `
-          --add-data "venv/Lib/site-packages/PyQt6/sip.cp38-win_amd64.pyd;PyQt6/sip.pyd" `
-          --add-data "venv/Lib/site-packages/PyQt6/Qt6;PyQt6/Qt6" `
+          --add-data "venv/Lib/site-packages/PyQt6/sip.cp*-win_amd64.pyd;PyQt6/sip.pyd" `
+          --add-data "venv/Lib/site-packages/PyQt6/Qt6;PyQt6/Qt6' `
           nanovna-saver.py
     - name: Archive production artifacts
       uses: actions/upload-artifact@v1