From ceb5b2bbd31cd7305c5b2aa8dee5b48547744204 Mon Sep 17 00:00:00 2001 From: Till Frankenbach Date: Wed, 27 May 2026 16:16:01 +0200 Subject: [PATCH 1/7] fix: remove Qt6 support flag from metadata --- ORStools/metadata.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ORStools/metadata.txt b/ORStools/metadata.txt index da50ab09..f30fbe4b 100644 --- a/ORStools/metadata.txt +++ b/ORStools/metadata.txt @@ -2,7 +2,6 @@ name=ORS Tools qgisMinimumVersion=3.4.8 description=openrouteservice routing, isochrones and matrix calculations for QGIS -supportsQt6=True version=2.1.0 author=HeiGIT gGmbH From 0ede33979525516afed7ffab9d5772cb56c98106 Mon Sep 17 00:00:00 2001 From: Till Frankenbach Date: Wed, 27 May 2026 16:17:18 +0200 Subject: [PATCH 2/7] fix: restore qgisMaximumVersion in metadata --- ORStools/metadata.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ORStools/metadata.txt b/ORStools/metadata.txt index f30fbe4b..9d32b56b 100644 --- a/ORStools/metadata.txt +++ b/ORStools/metadata.txt @@ -1,6 +1,7 @@ [general] name=ORS Tools qgisMinimumVersion=3.4.8 +qgisMaximumVersion=4.99 description=openrouteservice routing, isochrones and matrix calculations for QGIS version=2.1.0 From d37a0e811564bedb7fbb697e6367a31ebf500b63 Mon Sep 17 00:00:00 2001 From: Till Frankenbach Date: Wed, 27 May 2026 16:23:06 +0200 Subject: [PATCH 3/7] fix: add pyqt6-check job to GitHub Actions workflow --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9790ef87..61416b02 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,11 @@ on: push: jobs: + pyqt6-check: + uses: opengisch/qgis-plugin-ci/.github/workflows/pyqt6_test.yml@master + with: + plugin_path: ORSTools + test_3_16: runs-on: ubuntu-latest steps: From 61e960d0150263cbabf372a7dd383bab0e50806a Mon Sep 17 00:00:00 2001 From: Jakob Schnell Date: Thu, 28 May 2026 15:36:13 +0200 Subject: [PATCH 4/7] test: adapt layer feature count --- tests/test_gui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_gui.py b/tests/test_gui.py index 023e5a3a..487b1508 100644 --- a/tests/test_gui.py +++ b/tests/test_gui.py @@ -411,7 +411,7 @@ def test_custom_endpoints(self): self.assertEqual(settings_directions_endpoint, "directions") layer = proc.get_directions_points_layer() - self.assertAlmostEqual(layer.featureCount(), 93, delta=3) + self.assertAlmostEqual(layer.featureCount(), 97, delta=3) self.assertEqual( "POINT(8.67251100000000008 49.39887900000000087)", From dc403bee4235e721307aa1a4346dad58dda6fec6 Mon Sep 17 00:00:00 2001 From: Jakob Schnell Date: Wed, 10 Jun 2026 14:16:44 +0200 Subject: [PATCH 5/7] CI: run test on 3.X, LTR, 4.X, latest --- .github/workflows/test.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61416b02..92d3bfdc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,13 +20,22 @@ jobs: docker run -v ${GITHUB_WORKSPACE}:/src -w /src qgis/qgis:release-3_16 sh -c 'apt-get -y update && apt-get -y install xvfb && export ORS_API_KEY=${{ secrets.ORS_API_KEY }} && pip install -U pytest && xvfb-run -a pytest' env: DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }} - test_3_22: + test_ltr: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Run test 3.22 + - name: Run test LTR run: | - docker run -v ${GITHUB_WORKSPACE}:/src -w /src qgis/qgis:release-3_22 sh -c 'apt-get -y update && apt-get -y install xvfb && export ORS_API_KEY=${{ secrets.ORS_API_KEY }} && export DISPLAY=:0.0 && pip install -U pytest && xvfb-run -a pytest' + docker run -v ${GITHUB_WORKSPACE}:/src -w /src qgis/qgis:ltr-trixie sh -c 'apt-get -y update && apt-get -y install xvfb && export ORS_API_KEY=${{ secrets.ORS_API_KEY }} && export DISPLAY=:0.0 && pip install -U pytest && xvfb-run -a pytest' + env: + DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }} + test_4.0: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Run test 4.0 + run: | + docker run -v ${GITHUB_WORKSPACE}:/src -w /src qgis/qgis:4.0 sh -c 'apt-get -y update && apt-get -y install xvfb && export ORS_API_KEY=${{ secrets.ORS_API_KEY }} && export PYTHONPATH=/usr/share/qgis/python && apt install python3-pytest && xvfb-run -a pytest' env: DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }} test_latest: From 846d4f6fd7e73b9d859df174d9f9c1d5a2e4870c Mon Sep 17 00:00:00 2001 From: Jakob Schnell Date: Wed, 10 Jun 2026 14:18:26 +0200 Subject: [PATCH 6/7] CI: fix identifier name --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92d3bfdc..0f1bfd1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: docker run -v ${GITHUB_WORKSPACE}:/src -w /src qgis/qgis:ltr-trixie sh -c 'apt-get -y update && apt-get -y install xvfb && export ORS_API_KEY=${{ secrets.ORS_API_KEY }} && export DISPLAY=:0.0 && pip install -U pytest && xvfb-run -a pytest' env: DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }} - test_4.0: + test_4_0: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 6de8e20877fd4babf2058b7b352c1cb37609360f Mon Sep 17 00:00:00 2001 From: Jakob Schnell Date: Wed, 10 Jun 2026 14:33:29 +0200 Subject: [PATCH 7/7] CI: install pytest via apt --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f1bfd1e..74519e91 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4 - name: Run test LTR run: | - docker run -v ${GITHUB_WORKSPACE}:/src -w /src qgis/qgis:ltr-trixie sh -c 'apt-get -y update && apt-get -y install xvfb && export ORS_API_KEY=${{ secrets.ORS_API_KEY }} && export DISPLAY=:0.0 && pip install -U pytest && xvfb-run -a pytest' + docker run -v ${GITHUB_WORKSPACE}:/src -w /src qgis/qgis:ltr-trixie sh -c 'apt-get -y update && apt-get -y install xvfb && export ORS_API_KEY=${{ secrets.ORS_API_KEY }} && export DISPLAY=:0.0 && apt install python3-pytest && xvfb-run -a pytest' env: DOCKER_IMAGE: ${{ steps.docker-build.outputs.FULL_IMAGE_NAME }} test_4_0: