Merge pull request #138 from mjanez/ckan-2.9.11

Update CKAN configuration to includes vars to the metadata templates and update ckanext-schemingdcat
mjanez · Jun 17, 2024 · 6789b13 · 6789b13
2 parents 95b6d6e + 4542fb5
commit 6789b13
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.env.example b/.env.example
@@ -1,5 +1,7 @@
 # Base
 APP_DIR=/srv/app
+# Sets Docker Compose project name to avoid resource conflicts between projects. Defaults to the folder name "ckan-docker" if not set.
+#COMPOSE_PROJECT_NAME=ckan-docker-mytheme
 
 # Host Ports
 CKAN_PORT_HOST=5000
@@ -173,6 +175,7 @@ CKANEXT__SCHEMINGDCAT_ORGANIZATION_CUSTOM_FACETS=True
 CKANEXT__SCHEMINGDCAT_GROUP_CUSTOM_FACETS=True
 CKANEXT__SCHEMINGDCAT_DEFAULT_PACKAGE_ITEM_ICON="theme"
 CKANEXT__SCHEMINGDCAT_DEFAULT_PACKAGE_ITEM_SHOW_SPATIAL=True
+CKANEXT__SCHEMINGDCAT_SHOW_METADATA_TEMPLATES_TOOLBAR=False
 
 # ckanext-pages
 CKANEXT__PAGES__ALOW_HTML=False

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/[email protected]#egg=ckanext-geoview && \
     echo "ckan/ckanext-spatial" && \
     pip3 install --no-cache-dir -e git+https://github.com/ckan/[email protected]#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/[email protected]#egg=ckanext-dcat && \
     pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-dcat/requirements.txt && \

diff --git a/ckan/docker-entrypoint.d/02_setup_scheming.sh b/ckan/docker-entrypoint.d/02_setup_scheming.sh
@@ -15,7 +15,8 @@ ckan config-tool $CKAN_INI \
     "schemingdcat.group_custom_facets=$CKANEXT__SCHEMINGDCAT_GROUP_CUSTOM_FACETS" \
     "schemingdcat.geometadata_base_uri=$CKANEXT__SCHEMINGDCAT_GEOMETADATA_BASE_URI" \
     "schemingdcat.default_package_item_icon=$CKANEXT__SCHEMINGDCAT_DEFAULT_PACKAGE_ITEM_ICON" \
-    "schemingdcat.default_package_item_show_spatial=$CKANEXT__SCHEMINGDCAT_DEFAULT_PACKAGE_ITEM_SHOW_SPATIAL"
+    "schemingdcat.default_package_item_show_spatial=$CKANEXT__SCHEMINGDCAT_DEFAULT_PACKAGE_ITEM_SHOW_SPATIAL" \
+    "schemingdcat.show_metadata_templates_toolbar=$CKANEXT__SCHEMINGDCAT_SHOW_METADATA_TEMPLATES_TOOLBAR"
 
 echo "[docker-entrypoint.02_setup_scheming] Rebuild index"
 ckan -c $CKAN_INI search-index rebuild
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