Update to current version

.github/workflows/code-style.yml

@@ -11,4 +11,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - uses: pre-commit/action@v2.0.2
+      - uses: pre-commit/action@v3.0.0

.github/workflows/release.yml

@@ -23,8 +23,9 @@ jobs:
       #      run: sudo apt-get update && sudo apt-get install qt5-default qttools5-dev-tools
 
       - name: Install qgis-plugin-ci
-        run: pip3 install qgis-plugin-ci
+        run: pip3 install git+https://github.com/GispoCoding/qgis-plugin-ci.git
 
+      # When osgeo upload is wanted: --osgeo-username usrname --osgeo-password ${{ secrets.OSGEO_PASSWORD }}
       # When Transifex is wanted: --transifex-token ${{ secrets.TRANSIFEX_TOKEN }}
       - name: Deploy plugin
-        run: qgis-plugin-ci release ${GITHUB_REF/refs\/tags\//}  --osgeo-username ${{ secrets.OSGEO_USER }}  --osgeo-password ${{ secrets.OSGEO_PASSWORD }} --github-token ${{ secrets.GITHUB_TOKEN }} --disable-submodule-update
+        run: qgis-plugin-ci release latest --osgeo-username ${{ secrets.OSGEO_USER }} --osgeo-password ${{ secrets.OSGEO_PASSWORD }} --github-token ${{ secrets.GITHUB_TOKEN }} --disable-submodule-update

.github/workflows/test-and-pre-release.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         # Remove unsupported versions and add more versions. Use LTR version in the cov_tests job
-        docker_tags: [release-3_16, latest]
+        docker_tags: [release-3_16, final-3_22_9, latest]
       fail-fast: false
 
     # Steps represent a sequence of tasks that will be executed as part of the job
@@ -31,7 +31,7 @@ jobs:
 
       # Runs all tests
       - name: Run tests
-        run: docker run --rm --net=host --volume `pwd`:/app -w=/app -e QGIS_PLUGIN_IN_CI=1 qgis/qgis:${{ matrix.docker_tags }} sh -c "pip3 install -q -r requirements-test.txt pytest-cov && xvfb-run -s '+extension GLX -screen 0 1024x768x24' pytest -v --cov --cov-report=xml"
+        run: docker run --rm --net=host --volume `pwd`:/app -w=/app -e QGIS_PLUGIN_IN_CI=1 qgis/qgis:${{ matrix.docker_tags }} sh -c "pip3 install -q -r requirements-test.txt pytest-cov && xvfb-run -s '+extension GLX -screen 0 1024x768x24' pytest -v --cov --cov-report=xml Catchment/test"
 
       # Upload coverage report. Will not work if the repo is private
       - name: Upload coverage to Codecov
@@ -59,10 +59,10 @@ jobs:
       - name: Run tests
         shell: pwsh
         run: |
-          $env:PATH="C:\Program Files\QGIS 3.16\bin;$env:PATH"
+          $env:PATH="C:\Program Files\QGIS 3.22.11\bin;$env:PATH"
           $env:QGIS_PLUGIN_IN_CI=1
           python-qgis-ltr.bat -m pip install -q -r requirements-test.txt
-          python-qgis-ltr.bat -m pytest -v
+          python-qgis-ltr.bat -m pytest -v Catchment/test
 
   pre-release:
     name: "Pre Release"
@@ -102,7 +102,7 @@ jobs:
       #      run: sudo apt-get update && sudo apt-get install qt5-default qttools5-dev-tools
 
       - name: Install qgis-plugin-ci
-        run: pip3 install qgis-plugin-ci
+        run: pip3 install git+https://github.com/GispoCoding/qgis-plugin-ci.git
 
       # When Transifex is wanted: --transifex-token ${{ secrets.TRANSIFEX_TOKEN }}
       - name: Deploy plugin

.pre-commit-config.yaml

@@ -2,29 +2,30 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.0.1
     hooks:
       - id: trailing-whitespace
+        exclude: Catchment/metadata.txt
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.8.0
-    hooks:
-      - id: isort
+  # - repo: https://github.com/PyCQA/isort
+  #   rev: 5.10.1
+  #   hooks:
+  #     - id: isort
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.10.0
     hooks:
       - id: black
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.812
-    hooks:
-      - id: mypy
+  # - repo: https://github.com/pre-commit/mirrors-mypy
+  #   rev: v0.812
+  #   hooks:
+  #     - id: mypy
   - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.1
+    rev: 4.0.1
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-bugbear~=21.4.3
           - pep8-naming~=0.11.1
-          - flake8-annotations~=2.6.2
+          - flake8-qgis>=0.1.3

.qgis-plugin-ci

@@ -1,5 +1,5 @@
 plugin_path: Catchment
 github_organization_slug: GispoCoding
-project_slug: catchment-plugin
+project_slug: school-catchment-plugin
 transifex_coordinator: replace-me
 transifex_organization: replace-me

CHANGELOG.md

@@ -1,5 +1,64 @@
 # CHANGELOG
+## 0.4.3 - 2021-11-01
 
+### Changed
 
+- Changed IIEP logo to correct size
 
-###
+## 0.4.2 - 2021-10-31
+
+### Changed
+
+- IIEP logo added
+- Test runners updated to latest versions and fixed
+
+## 0.4.1 - 2021-12-17
+
+### Changed
+
+- Fix bug that made links in About panel non-clickable
+- Decrease time and distance increments to allow calculating 100 meter and 1 minute intervals
+
+## 0.4.0 - 2021-12-08
+
+### Added
+
+- Option to subtract indoor walking distance per point before calculating point isochrone
+
+## 0.3.1 - 2021-11-30
+### Changed
+
+- Fix bug merging isochrones for layers with several attribute fields
+- Fix bug when merged isochrones are multipolygons
+
+## 0.3.0 - 2021-11-25
+
+### Added
+
+- Option to merge isochrones by field value, e.g. merging isochrones of multiple entrances of the same building
+
+### Changed
+
+- Isochrone original_fid field is now string (due to possible merging of isochrones)
+- UI checkboxes moved to separate Extra options field to indicate they are optional
+
+## 0.2.1 - 2021-11-24
+
+### Changed
+
+- Fixes to release workflow
+
+## 0.2.0 - 2021-11-24
+
+### Added
+
+- Option to limit areas to polygon boundaries, i.e. limiting isochrones to given polygons around each point
+
+### Changed
+
+- Updated test and development dependencies
+- Isochrones are now multipolygons (due to boundary intersections) instead of simple polygons
+
+## 0.1.0 - 2021-06-11
+
+- First official version published