From 6745ddb9d5101e26a62c13704a638f8af2b55c54 Mon Sep 17 00:00:00 2001 From: Peter Lissens Date: Sun, 19 May 2024 01:28:11 +0200 Subject: [PATCH 1/8] Update test_get_crs_code to validate https can be in srsName --- tests/test_axisorder.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_axisorder.py b/tests/test_axisorder.py index fe44f62..0035add 100644 --- a/tests/test_axisorder.py +++ b/tests/test_axisorder.py @@ -8,6 +8,8 @@ def test_get_crs_code(): assert get_crs_code('EPSG:4326') == 4326 assert get_crs_code('http://www.opengis.net/def/crs/EPSG/0/4326') == 4326 assert get_crs_code('http://www.opengis.net/gml/srs/epsg.xml#4326') == 4326 + assert get_crs_code('https://www.opengis.net/def/crs/EPSG/0/4326') == 4326 + assert get_crs_code('https://www.opengis.net/gml/srs/epsg.xml#4326') == 4326 assert get_crs_code('urn:EPSG:geographicCRS:4326') == 4326 assert get_crs_code('urn:ogc:def:crs:EPSG::4326') == 4326 assert get_crs_code('urn:ogc:def:crs:EPSG:4326') == 4326 From 0f79cdf57002fae543bd117dd441b956f186867d Mon Sep 17 00:00:00 2001 From: Peter Lissens Date: Sun, 19 May 2024 01:49:14 +0200 Subject: [PATCH 2/8] Update RE_CRS_CODE to allow https in srsName --- pygml/axisorder.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pygml/axisorder.py b/pygml/axisorder.py index f50ad58..fd061fa 100644 --- a/pygml/axisorder.py +++ b/pygml/axisorder.py @@ -184,8 +184,8 @@ RE_CRS_CODE = re.compile( r'(EPSG:|' - r'http://www\.opengis\.net/def/crs/epsg/0/|' - r'http://www\.opengis\.net/gml/srs/epsg\.xml\#|' + r'http[s]?://www\.opengis\.net/def/crs/epsg/0/|' + r'http[s]?://www\.opengis\.net/gml/srs/epsg\.xml\#|' r'urn:EPSG:geographicCRS:|' r'urn:ogc:def:crs:EPSG::|' r'urn:ogc:def:crs:OGC::|' @@ -201,6 +201,8 @@ def get_crs_code(crs: str) -> Union[int, str]: * ``EPSG:`` * ``http://www.opengis.net/def/crs/EPSG/0/`` * ``http://www.opengis.net/gml/srs/epsg.xml#`` + * ``https://www.opengis.net/def/crs/EPSG/0/`` + * ``https://www.opengis.net/gml/srs/epsg.xml#`` * ``urn:EPSG:geographicCRS:`` * ``urn:ogc:def:crs:EPSG::`` * ``urn:ogc:def:crs:OGC::`` From aaf62a998f6ec28017a8f53a32c6565b0dd2cd76 Mon Sep 17 00:00:00 2001 From: Peter Lissens Date: Thu, 23 May 2024 00:45:25 +0200 Subject: [PATCH 3/8] Update .bumpversion.cfg --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 92bf6ee..9181bc8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.2 +current_version = 0.2.3 commit = True tag = True tag_name = release-{new_version} From 34bfd206fb48512315d1061bd47a3f3f3fa82628 Mon Sep 17 00:00:00 2001 From: Peter Lissens Date: Thu, 23 May 2024 00:45:58 +0200 Subject: [PATCH 4/8] Update conf.py --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 5604a14..577ec50 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,7 +26,7 @@ # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = '0.2.2' +release = '0.2.3' # -- General configuration --------------------------------------------------- From 3186d53c1aea788ed9a52324a026d5c98d8efd45 Mon Sep 17 00:00:00 2001 From: Peter Lissens Date: Thu, 23 May 2024 00:46:22 +0200 Subject: [PATCH 5/8] Update __init__.py --- pygml/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygml/__init__.py b/pygml/__init__.py index c307dc0..52d797a 100644 --- a/pygml/__init__.py +++ b/pygml/__init__.py @@ -28,6 +28,6 @@ from .parse import parse -__version__ = '0.2.2' +__version__ = '0.2.3' __all__ = ['parse'] From fae6b5b5693ed15cbfe14bd54ff91f712ae2fbd9 Mon Sep 17 00:00:00 2001 From: Peter Lissens Date: Thu, 23 May 2024 00:48:26 +0200 Subject: [PATCH 6/8] Update test.yaml --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0c6db80..4a72825 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 From f7d181126baff27fc6cea9c4e0ca744fa026c226 Mon Sep 17 00:00:00 2001 From: Peter Lissens Date: Thu, 23 May 2024 00:54:59 +0200 Subject: [PATCH 7/8] define py version numbers as str, not num --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4a72825..fb370b1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 From b912f953836cdd243bbab320f6efa55680759b6b Mon Sep 17 00:00:00 2001 From: Peter Lissens Date: Thu, 23 May 2024 01:38:19 +0200 Subject: [PATCH 8/8] Update setup.py to include latest py versions --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 6186a40..b663b92 100644 --- a/setup.py +++ b/setup.py @@ -73,6 +73,9 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], tests_require=['pytest'] )