Merge pull request #339 from QGIS-Contribution/packaging/use-python-3…

…-12-to-fit-qgis-windows-version update(ci): use Python 3.12 to fit QGIS shipped version
QGIS-Contribution · Jan 6, 2025 · 73b0035 · 73b0035
2 parents b784ba7 + 316b56c
commit 73b0035
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 21 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -2,16 +2,18 @@ name: "📦 Build & 🚀 Release"
 
 env:
   PROJECT_FOLDER: "qgis_resource_sharing"
-  PYTHON_VERSION: 3.9
+  PYTHON_VERSION: "3.12"
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
     tags:
       - "*"
 
   pull_request:
-    branches: [master]
+    branches:
+      - master
     paths:
       - .github/workflows/build_release.yml
 
@@ -27,7 +29,9 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
+          # commented out waiting for Python 3.12 being available for pyqt5-tools. See: https://github.com/altendky/pyqt-tools/issues/131
+          # python-version: ${{ env.PYTHON_VERSION }}
+          python-version: "3.11"
           cache: "pip"
           cache-dependency-path: "requirements/translation.txt"
 
@@ -88,7 +92,9 @@ jobs:
   packaging:
     name: "📦 Packaging plugin"
     runs-on: ubuntu-latest
-    needs: [translation, dependencies]
+    needs:
+      - dependencies
+      - translation
 
     if: ${{ !startsWith(github.ref, 'refs/tags/') }}
 
@@ -145,7 +151,9 @@ jobs:
   release:
     name: "🚀 Release"
     runs-on: ubuntu-latest
-    needs: [translation, dependencies]
+    needs:
+      - dependencies
+      - translation
 
     if: startsWith(github.ref, 'refs/tags/')
 

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -29,7 +29,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  PYTHON_VERSION: 3.9
+  PYTHON_VERSION: "3.12"
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -2,18 +2,20 @@ name: "✅ Linter"
 
 env:
   PROJECT_FOLDER: "qgis_resource_sharing"
-  PYTHON_VERSION: 3.9
+  PYTHON_VERSION: "3.12"
 
 # because linter is a required check, it must be triggered on every push and not filtered on paths
 on:
   push:
-    branches: [master]
+    branches:
+      - master
     paths:
       - "**.py"
       - .github/workflows/linter.yml
 
   pull_request:
-    branches: [master]
+    branches:
+      - master
     paths:
       - "**.py"
       - .github/workflows/linter.yml

diff --git a/.github/workflows/tester.yml b/.github/workflows/tester.yml
@@ -2,15 +2,17 @@ name: "🎳 Tester"
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
     paths:
       - "**.py"
       - .github/workflows/tester.yml
       - requirements/embedded.txt
       - requirements/testing.txt
 
   pull_request:
-    branches: [master]
+    branches:
+      - master
     paths:
       - "**.py"
       - .github/workflows/tester.yml
@@ -19,7 +21,7 @@ on:
 
 env:
   PROJECT_FOLDER: "qgis_resource_sharing"
-  PYTHON_VERSION: 3.9
+  PYTHON_VERSION: "3.12"
 
 jobs:
   tests-unit:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,48 +5,60 @@ repos:
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
-        args: ["--maxkb=500"]
+        args:
+          - --maxkb=500
       - id: check-case-conflict
       - id: check-xml
       - id: check-yaml
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: fix-byte-order-marker
       - id: fix-encoding-pragma
-        args: [--remove]
+        args:
+          - --remove
       - id: trailing-whitespace
-        args: [--markdown-linebreak-ext=md]
+        args:
+          - --markdown-linebreak-ext=md
 
   - repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.5.5
     hooks:
       - id: remove-tabs
-        args: ["--whitespaces-count", "4"]
+        args:
+          - --whitespaces-count
+          - "4"
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: "v0.8.1"
     hooks:
       - id: ruff
-        args: ["--fix-only", "--target-version=py39"]
+        args:
+          - --fix-only
+          - --target-version=py312
 
   - repo: https://github.com/psf/black
     rev: 24.10.0
     hooks:
       - id: black
-        args: ["--target-version=py39"]
+        args:
+          - --target-version=py312
 
   - repo: https://github.com/pycqa/isort
     rev: 5.13.2
     hooks:
       - id: isort
-        args: ["--profile", "black", "--filter-files"]
+        args:
+          - --profile
+          - black
+          - --filter-files
 
   - repo: https://github.com/pycqa/flake8
     rev: 7.1.1
     hooks:
       - id: flake8
         files: ^qgis_resource_sharing/.*\.py$
-        additional_dependencies: ["flake8-qgis<2"]
+        additional_dependencies:
+          - "flake8-qgis"
         args:
           [
             "--config=setup.cfg",