From e9c3f48b8a257bac536a20114e110fdd16cad8f0 Mon Sep 17 00:00:00 2001 From: GeoJulien Date: Mon, 13 May 2024 22:45:52 +0200 Subject: [PATCH 1/2] update(ci): use Python 3.12 to fit QGIS shipped version --- .github/workflows/build_release.yml | 16 +++++++++++----- .github/workflows/documentation.yml | 2 +- .github/workflows/linter.yml | 8 +++++--- .github/workflows/tester.yml | 8 +++++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 0096979d..3d87f7f6 100644 --- 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 @@ -88,7 +90,9 @@ jobs: packaging: name: "📦 Packaging plugin" runs-on: ubuntu-latest - needs: [translation, dependencies] + needs: + - dependencies + - translation if: ${{ !startsWith(github.ref, 'refs/tags/') }} @@ -145,7 +149,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 index 5a710d84..e75c6cb8 100644 --- 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 index 0e68b944..61e87e30 100644 --- 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 index bcd413ee..7c1fbf31 100644 --- a/.github/workflows/tester.yml +++ b/.github/workflows/tester.yml @@ -2,7 +2,8 @@ name: "🎳 Tester" on: push: - branches: [master] + branches: + - master paths: - "**.py" - .github/workflows/tester.yml @@ -10,7 +11,8 @@ on: - 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: From 249d468f7908e59f7e052e2255437b65ef72a36b Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 13 May 2024 22:59:21 +0200 Subject: [PATCH 2/2] packaging: set QGIS minimum version to follow broken Python version in QGIS LTR Signed-off-by: Julien --- qgis_resource_sharing/metadata.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qgis_resource_sharing/metadata.txt b/qgis_resource_sharing/metadata.txt index 1efb6cc6..7b972331 100644 --- a/qgis_resource_sharing/metadata.txt +++ b/qgis_resource_sharing/metadata.txt @@ -15,8 +15,8 @@ tracker=https://github.com/QGIS-Contribution/QGIS-ResourceSharing/issues/ # versioning version=1.1.0 -qgisMinimumVersion=3.22 -qgisMaximumVersion=3.34.5 +qgisMinimumVersion=3.34.6 +qgisMaximumVersion=3.99 experimental=False deprecated=False changelog=