Update ckanext-spatial reqs

Incompatibility with Shapely >2 Due to NumPy 2.0 Update, see: ckan/ckanext-spatial#330
mjanez · Jun 17, 2024 · 4542fb5 · 4542fb5
1 parent d7ebbf8
commit 4542fb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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/...eq_fixes/ckanext-spatial_requirements.txt → ...eq_fixes/ckanext-spatial/requirements.txt b/...eq_fixes/ckanext-spatial_requirements.txt → ...eq_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