From fa5e4ef982bf4213c04c107e169108aad43b3af6 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Mon, 26 Aug 2024 15:36:51 +0200 Subject: [PATCH] Raise QGIS minimum version to 3.28 --- .docker/docker-compose.yml | 2 +- .github/workflows/ci.yml | 9 - CHANGELOG.md | 2 +- pg_metadata/metadata.txt | 2 +- .../projects/pg_metadata_administration.qgs | 2493 +++++++++++++++-- pg_metadata/test/test_resources.py | 2 +- 6 files changed, 2274 insertions(+), 236 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 3bd7954d..6f31997a 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -30,7 +30,7 @@ services: qgis: profiles: - "qgis" - image: qgis/qgis:release-3_22 + image: qgis/qgis:release-3_28 container_name: qgis networks: qgis_plugin_network: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b976e512..81c5814d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,15 +111,6 @@ jobs: --osgeo-password ${{ secrets.OSGEO_PASSWORD }} --create-plugin-repo - - name: Tweet - uses: mugi111/tweet-trigger-release@v1.2 - with: - consumer_key: ${{ secrets.TWITTER_CONSUMER_KEY }} - consumer_secret: ${{ secrets.TWITTER_CONSUMER_SECRET }} - access_token_key: ${{ secrets.TWITTER_ACCESS_TOKEN_KEY }} - access_token_secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }} - tweet_body: "New version of PgMetadata ${{ env.RELEASE_VERSION }} 🗂 for #QGIS and #PostgreSQL 🐘 https://github.com/3liz/qgis-pgmetadata-plugin/releases" - - name: Repository Dispatch uses: peter-evans/repository-dispatch@v3 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index ed4320f4..5aabd608 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -* Raise to QGIS 3.22 minimum version +* Raise to QGIS 3.28 minimum version * Upgrade to PostgreSQL 13 for testing and SQL files ## 1.3.0 - 2024-02-05 diff --git a/pg_metadata/metadata.txt b/pg_metadata/metadata.txt index 94143cb2..b8bde1c9 100644 --- a/pg_metadata/metadata.txt +++ b/pg_metadata/metadata.txt @@ -1,6 +1,6 @@ [general] name=PgMetadata -qgisMinimumVersion=3.22 +qgisMinimumVersion=3.28 description=Store some metadata about layers which are stored in PostgreSQL. It's possible to define title, abstract, links, contacts etc. It also provides some search tool, in the QGIS Locator bar for instance. author=3Liz email=info@3liz.com diff --git a/pg_metadata/resources/projects/pg_metadata_administration.qgs b/pg_metadata/resources/projects/pg_metadata_administration.qgs index ef717da6..99efa199 100644 --- a/pg_metadata/resources/projects/pg_metadata_administration.qgs +++ b/pg_metadata/resources/projects/pg_metadata_administration.qgs @@ -1,11 +1,10 @@ - + - - - + + - + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 @@ -21,7 +20,7 @@ - + @@ -71,7 +70,7 @@ - + @@ -96,7 +95,7 @@ - + @@ -115,7 +114,7 @@ - + @@ -156,7 +155,7 @@ 0 - + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 @@ -253,7 +252,6 @@ - Annotations_cf42651e_5b61_4496_9a61_b4923b089864 @@ -262,7 +260,7 @@ - + 0 @@ -285,7 +283,7 @@ - + 0 @@ -313,7 +311,7 @@ Contact - + 0 @@ -345,7 +343,7 @@ - + 0 @@ -389,6 +387,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -541,11 +671,34 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -583,7 +736,7 @@ def my_form_open(dialog, layer, feature): Dataset - + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 @@ -618,7 +771,7 @@ def my_form_open(dialog, layer, feature): - + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 @@ -662,9 +815,141 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -686,17 +971,6 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - @@ -712,12 +986,12 @@ def my_form_open(dialog, layer, feature): - + - + @@ -747,25 +1021,6 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - @@ -775,7 +1030,7 @@ def my_form_open(dialog, layer, feature): - + @@ -797,17 +1052,6 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - @@ -829,8 +1073,8 @@ def my_form_open(dialog, layer, feature): - - + + @@ -850,7 +1094,7 @@ def my_form_open(dialog, layer, feature): - + @@ -877,10 +1121,10 @@ def my_form_open(dialog, layer, feature): 1 - + - + @@ -918,33 +1162,6 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1490,50 +1707,180 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - + + + + + + + - + + + + + + + @@ -1621,7 +1968,7 @@ def my_form_open(dialog, layer, feature): Dataset <-> Contact - + 0 @@ -1653,7 +2000,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -1697,6 +2044,138 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1873,7 +2352,7 @@ def my_form_open(dialog, layer, feature): Glossary - + 0 @@ -1905,7 +2384,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -1949,36 +2428,168 @@ def my_form_open(dialog, layer, feature): - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2203,7 +2814,7 @@ def my_form_open(dialog, layer, feature): HTML templates - + 0 @@ -2235,7 +2846,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -2279,6 +2890,138 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2395,8 +3138,19 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - + + + + + + + + + + + + + @@ -2422,7 +3176,7 @@ def my_form_open(dialog, layer, feature): Link - + 0 @@ -2456,7 +3210,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -2500,6 +3254,138 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2731,14 +3617,49 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2776,7 +3697,7 @@ def my_form_open(dialog, layer, feature): Theme - + 0 @@ -2808,7 +3729,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -2852,15 +3773,147 @@ def my_form_open(dialog, layer, feature): - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2995,7 +4048,7 @@ def my_form_open(dialog, layer, feature): Locales - + 0 @@ -3018,7 +4071,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -3054,6 +4107,138 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3121,7 +4306,7 @@ def my_form_open(dialog, layer, feature): Orphan metadata - + 0 @@ -3153,7 +4338,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -3197,6 +4382,138 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3303,8 +4620,19 @@ def my_form_open(dialog, layer, feature): 0 tablayout - - + + + + + + + + + + + + + @@ -3330,7 +4658,7 @@ def my_form_open(dialog, layer, feature): Orphan tables - + 0 @@ -3362,7 +4690,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -3406,6 +4734,138 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3711,7 +5314,14 @@ def my_form_open(dialog, layer, feature): 0 tablayout - + + + + + + + + @@ -3735,7 +5345,7 @@ def my_form_open(dialog, layer, feature): Table comments - + 0 @@ -3758,7 +5368,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -3794,6 +5404,138 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3905,7 +5647,7 @@ def my_form_open(dialog, layer, feature): Table list - + 0 @@ -3937,7 +5679,7 @@ def my_form_open(dialog, layer, feature): - + 0 @@ -3981,6 +5723,138 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4264,14 +6281,7 @@ def my_form_open(dialog, layer, feature): - - - - - - 1 - true - + 2 @@ -4410,11 +6420,12 @@ def my_form_open(dialog, layer, feature): + - - + + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] +proj=longlat +datum=WGS84 +no_defs 3452 @@ -4427,19 +6438,55 @@ def my_form_open(dialog, layer, feature): + + + - + + + + + + + - + + + + + + + + + + + + + + + + + + GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]] + +proj=longlat +datum=WGS84 +no_defs + 3452 + 4326 + EPSG:4326 + WGS 84 + longlat + EPSG:7030 + true + + \ No newline at end of file diff --git a/pg_metadata/test/test_resources.py b/pg_metadata/test/test_resources.py index 9d011060..51e2e7ac 100644 --- a/pg_metadata/test/test_resources.py +++ b/pg_metadata/test/test_resources.py @@ -16,7 +16,7 @@ class TestResources(unittest.TestCase): def test_qgis_version(self): """ Test QGIS versions are correct in metadata and provided QGIS version. """ - expected_qgis_version = "3.22" + expected_qgis_version = "3.28" # Test the QGIS project qgis_project = resources_path('projects', 'pg_metadata_administration.qgs')