From aba03f7a3df639d13355d80651d6007b929c364f Mon Sep 17 00:00:00 2001 From: amercader Date: Wed, 6 Nov 2024 12:33:38 +0100 Subject: [PATCH 1/7] Remove import not present in CKAN master --- ckanext/spatial/util.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ckanext/spatial/util.py b/ckanext/spatial/util.py index fc822d2e..cbc6bd7e 100644 --- a/ckanext/spatial/util.py +++ b/ckanext/spatial/util.py @@ -12,7 +12,6 @@ from pprint import pprint from ckan import model -from ckan.model.package_extra import PackageExtra try: from ckanext.spatial.lib.reports import validation_report From 84f6980a9c9ea2d36b61e176394e6dc0320d04cf Mon Sep 17 00:00:00 2001 From: amercader Date: Wed, 6 Nov 2024 12:33:49 +0100 Subject: [PATCH 2/7] Solr image --- .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 59f3dcc8..1224f3d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: include: - ckan-version: "2.11" ckan-image: "ckan/ckan-dev:2.11-py3.10" - solr-image: "2.10-solr9-spatial" + solr-image: "2.11-solr9-spatial" harvester-version: 'master' - ckan-version: "2.10" ckan-image: "ckan/ckan-dev:2.10-py3.10" From fefbc6b36a1aa01983cec5128c9bb9f3118539bf Mon Sep 17 00:00:00 2001 From: amercader Date: Wed, 6 Nov 2024 14:16:51 +0100 Subject: [PATCH 3/7] Run just one test --- .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 1224f3d3..72cb3b16 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -97,4 +97,4 @@ jobs: sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini - name: Run tests - run: pytest --ckan-ini=test.ini --cov=ckanext.spatial --cov-report term-missing --cov-append --disable-warnings ckanext/spatial/tests + run: pytest --ckan-ini=test.ini --cov=ckanext.spatial --cov-report term-missing --cov-append --disable-warnings ckanext/spatial/tests/test_spatial_search.py::TestBBoxSearch::test_spatial_real_multipolygon_inside_extent_no_intersect From 0e597dfdf064b73eef2115ceaf74f9fdb66d413d Mon Sep 17 00:00:00 2001 From: amercader Date: Thu, 7 Nov 2024 13:22:51 +0100 Subject: [PATCH 4/7] Revert "Run just one test" This reverts commit fefbc6b36a1aa01983cec5128c9bb9f3118539bf. --- .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 72cb3b16..1224f3d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -97,4 +97,4 @@ jobs: sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini - name: Run tests - run: pytest --ckan-ini=test.ini --cov=ckanext.spatial --cov-report term-missing --cov-append --disable-warnings ckanext/spatial/tests/test_spatial_search.py::TestBBoxSearch::test_spatial_real_multipolygon_inside_extent_no_intersect + run: pytest --ckan-ini=test.ini --cov=ckanext.spatial --cov-report term-missing --cov-append --disable-warnings ckanext/spatial/tests From 91a53c0bf8dbed28d3b90b2165c47a4be813df6a Mon Sep 17 00:00:00 2001 From: amercader Date: Thu, 7 Nov 2024 13:24:42 +0100 Subject: [PATCH 5/7] Bump shapely requirement, fixes #340 --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 57e1fb80..e8252e54 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,6 @@ cython==0.29.36; python_version < '3.9' pyproj==2.6.1; python_version < '3.9' pyproj==3.6.1; python_version >= '3.9' -Shapely==2.0.4 -OWSLib==0.31.0 +Shapely==2.0.6 +OWSLib==0.32.0 geojson==3.1.0 From e75eb3f0035a85106a8d6306c9863f9d9be7ab17 Mon Sep 17 00:00:00 2001 From: amercader Date: Thu, 7 Nov 2024 13:31:41 +0100 Subject: [PATCH 6/7] Handle owslib across python versions --- requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e8252e54..d457a729 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,9 +4,12 @@ argparse pyparsing>=2.1.10 requests>=1.1.0 cython==0.29.36; python_version < '3.9' + pyproj==2.6.1; python_version < '3.9' pyproj==3.6.1; python_version >= '3.9' +OWSLib==0.31.0; python_version < '3.9' +OWSLib==0.32.0; python_version >= '3.9' + Shapely==2.0.6 -OWSLib==0.32.0 geojson==3.1.0 From 0fa3713e40cbe3e3b44980f21966f402d900b6e1 Mon Sep 17 00:00:00 2001 From: amercader Date: Thu, 7 Nov 2024 13:37:12 +0100 Subject: [PATCH 7/7] Now with proper versions --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index d457a729..bd0d1efa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,8 +8,8 @@ cython==0.29.36; python_version < '3.9' pyproj==2.6.1; python_version < '3.9' pyproj==3.6.1; python_version >= '3.9' -OWSLib==0.31.0; python_version < '3.9' -OWSLib==0.32.0; python_version >= '3.9' +OWSLib==0.31.0; python_version < '3.10' +OWSLib==0.32.0; python_version >= '3.10' Shapely==2.0.6 geojson==3.1.0