From 4542fb5928b9dfd44c42056ec9ee0327f4302b2f Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Mon, 17 Jun 2024 08:26:28 +0000 Subject: [PATCH] Update ckanext-spatial reqs Incompatibility with Shapely >2 Due to NumPy 2.0 Update, see: https://github.com/ckan/ckanext-spatial/issues/330 --- ckan/Dockerfile | 2 +- .../requirements.txt} | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) rename ckan/req_fixes/{ckanext-spatial_requirements.txt => ckanext-spatial/requirements.txt} (61%) diff --git a/ckan/Dockerfile b/ckan/Dockerfile index ebded0c7..1851ed5f 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -39,7 +39,7 @@ RUN echo ${TZ} > /etc/timezone && \ pip3 install --no-cache-dir -e git+https://github.com/ckan/ckanext-geoview.git@v0.1.0#egg=ckanext-geoview && \ echo "ckan/ckanext-spatial" && \ pip3 install --no-cache-dir -e git+https://github.com/ckan/ckanext-spatial.git@v2.1.1#egg=ckanext-spatial && \ - pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-spatial/requirements.txt && \ + pip3 install --no-cache-dir -r ${APP_DIR}/req_fixes/ckanext-spatial/requirements.txt && \ echo "mjanez/ckanext-dcat (GeoDCAT-AP extended version)" && \ pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-dcat.git@v1.8.0-alpha#egg=ckanext-dcat && \ pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-dcat/requirements.txt && \ diff --git a/ckan/req_fixes/ckanext-spatial_requirements.txt b/ckan/req_fixes/ckanext-spatial/requirements.txt similarity index 61% rename from ckan/req_fixes/ckanext-spatial_requirements.txt rename to ckan/req_fixes/ckanext-spatial/requirements.txt index b86d5173..0ce7a7c1 100644 --- a/ckan/req_fixes/ckanext-spatial_requirements.txt +++ b/ckan/req_fixes/ckanext-spatial/requirements.txt @@ -7,6 +7,9 @@ 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.1 +# Compatibility with NumPy 2.0: https://github.com/shapely/shapely/issues/1972 +numpy>=1.26,<2 +Shapely==2.0.4 + OWSLib==0.28.1 -geojson==3.0.1 +geojson==3.0.1 \ No newline at end of file