diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9790ef87..74519e91 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: @@ -15,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 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 && apt install python3-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 3.22 + - name: Run test 4.0 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: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: diff --git a/ORStools/metadata.txt b/ORStools/metadata.txt index da50ab09..9d32b56b 100644 --- a/ORStools/metadata.txt +++ b/ORStools/metadata.txt @@ -1,8 +1,8 @@ [general] name=ORS Tools qgisMinimumVersion=3.4.8 +qgisMaximumVersion=4.99 description=openrouteservice routing, isochrones and matrix calculations for QGIS -supportsQt6=True version=2.1.0 author=HeiGIT gGmbH 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)",