From a09cdf1c2e82c8788e591c60042b01163e3d9ce8 Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Wed, 13 Nov 2024 02:09:10 +0100 Subject: [PATCH] Update ckanext-schemingdcat to v4.2.3 and add private fields to ennvars --- .env.example | 3 +++ README.md | 5 +++-- ckan/Dockerfile | 4 ++-- samples/.env.codespaces | 3 +++ samples/.env.dev.example | 3 +++ samples/.env.es.example | 3 +++ 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index c2806eac..c8f8864c 100644 --- a/.env.example +++ b/.env.example @@ -224,7 +224,10 @@ CKANEXT__SCHEMINGDCAT__SOCIAL_X="https://x.com/ckanproject" CKANEXT__SCHEMINGDCAT__SOCIAL_LINKEDIN="https://www.linkedin.com/company/ckanproject" CKANEXT__SCHEMINGDCAT__OPEN_DATA_STATISTICS=True CKANEXT__SCHEMINGDCAT__OPEN_DATA_STATISTICS_THEMES=True +# Private fields to be hidden in the API responses +CKANEXT__SCHEMINGDCAT__API__PRIVATE_FIELDS="private_name private_email" CKANEXT__OPENAPI__ENDPOINTS='[{"url":"https://raw.githubusercontent.com/mjanez/ckanext-openapi/refs/heads/develop/ckanext/openapi/public/static/openapi/datastore.yaml","name":"datastore","title":{"en":"CKAN - Datastore API","es":"Portal de datos abiertos de CKAN - API Datastore"},"description":{"en":"This API provides live access to the Datastore portion of the CKAN Open Data Portal.","es":"Esta API proporciona acceso en tiempo real a la parte de Datastore del Portal de Datos Abiertos CKAN."}},{"url":"https://raw.githubusercontent.com/mjanez/ckanext-openapi/refs/heads/develop/ckanext/openapi/public/static/openapi/ckan.yaml","name":"ckan","title":{"en":"CKAN Open Data Portal - CKAN API (ES)","es":"Portal de datos abiertos de CKAN - API CKAN"},"description":{"en":"This API provides live access to the CKAN portion of the CKAN Open Data Portal.","es":"Esta API proporciona acceso en tiempo real a la parte de CKAN del Portal de Datos Abiertos CKAN."}}]' + # ckanext-pages CKANEXT__PAGES__ALOW_HTML=False CKANEXT__PAGES__ORGANIZATION=True diff --git a/README.md b/README.md index d6b02ae8..49985682 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ Information about extensions installed in the `main` image. More info described | Core + | [Datastore](https://github.com/mjanez/ckan-docker) | 2.10.5 | Stable | ✔️ | ✔️ | Stable installation (Production & Dev images) via Docker Compose. | | Core + | [~~Datapusher~~](https://github.com/mjanez/ckan-docker) | 0.0.19 | Deprecated | ❌ | ❌ | Updated to [xloader](https://github.com/ckan/ckanext-xloader), an express Loader - quickly load data into DataStore. | | Extension | [ckanext-xloader](https://github.com/mjanez/ckanext-xloader) | 1.0.1-stable | 🚧 WIP | ✔️ | ✔️ | Custom development from [`ckan/ckanext-xloader`](https://github.com/ckan/ckanext-xloader), a replacement for DataPusher because it offers ten times the speed and more robustness | -| Extension | [ckanext-harvest](https://github.com/ckan/ckanext-harvest) | v1.5.6 | Stable | ✔️ | ✔️ | Stable installation, necessary for the implementation of the Collector ([ogc_ckan](#recollector-ckan)) | +| Extension | [ckanext-harvest](https://github.com/mjanez/ckanext-harvest) | v1.5.6 | 🚧 WIP | ✔️ | ✔️ | Forked, remote harvest extension for CKAN to protect private harvest methods (API keys, DB logins, ...) | | Extension | [ckanext-geoview](https://github.com/ckan/ckanext-geoview) | 0.0.20 | Stable | ✔️ | ✔️ | Stable installation. | | Extension | [ckanext-spatial](https://github.com/ckan/ckanext-spatial) | v2.1.1 | Stable | ✔️ | ✔️ | Stable installation, required for implementing custom harvesters: ([ckanext-schemingdcat/harvesters](https://github.com/mjanez/ckanext-schemingdcat?tab=readme-ov-file#harvesters)) | | Extension | [ckanext-dcat](https://github.com/mjanez/ckanext-dcat) | v1.8.0 | 🚧 WIP | ✔️ | ✔️ | Latest stable version of vanilla [`ckanext-dcat`](https://github.com/ckan/ckanext-dcat) with minor fixes, includes base DCAT-AP 2/3 profiles extended by [`ckanext-schemingdcat`](https://github.com/mjanez/ckanext-schemingdcat) | @@ -93,7 +93,8 @@ Information about extensions installed in the `main` image. More info described | Extension | [ckanext-resourcedictionary](https://github.com/OpenDataGIS/ckanext-resourcedictionary) | v1.0.1 | 🚧 WIP | ✔️ | ✔️ | This extension extends the default CKAN Data Dictionary functionality by adding possibility to create data dictionary before actual data is uploaded to datastore. | | Extension | [ckanext-pages](https://github.com/ckan/ckanext-pages) | v0.5.2 | Stable | ✔️ | ✔️ | This extension gives you an easy way to add simple pages to CKAN. | | Extension | [ckanext-pdfview](https://github.com/ckan/ckanext-pdfview) | 0.0.8 | Stable | ✔️ | ✔️ | This extension provides a view plugin for PDF files using an html object tag. | -| Extension | [ckanext-schemingdcat](https://github.com/mjanez/ckanext-schemingdcat) | 4.0.0 | 🚧 WIP | ✔️ | ✔️ | Custom development to provide functions and templates specifically designed to extend [ckanext-scheming](https://github.com/mjanez/ckanext-scheming) and [`ckanext-dcat`](https://github.com/mjanez/ckanext-dcat). Customized ckanext schema[^5] and profiles based on the [Spanish Metadata Core](https://datos.gob.es/es/doc-tags/nti-risp) with the aim of completing the minimum metadata elements contained in the current datasets according to [GeoDCAT-AP](https://semiceu.github.io/GeoDCAT-AP/releases/) and [INSPIRE](https://inspire.ec.europa.eu/about-inspire). Also includes DCAT profile improvements and several enhancements like multilang for datasets, orgs and groups, themes, CLI, ... | +| Extension | [ckanext-schemingdcat](https://github.com/mjanez/ckanext-schemingdcat) | 4.2.3 | 🚧 WIP | ✔️ | ✔️ | Custom development to provide functions and templates specifically designed to extend [ckanext-scheming](https://github.com/mjanez/ckanext-scheming) and [`ckanext-dcat`](https://github.com/mjanez/ckanext-dcat). Customized ckanext schema[^5] and profiles based on the [Spanish Metadata Core](https://datos.gob.es/es/doc-tags/nti-risp) with the aim of completing the minimum metadata elements contained in the current datasets according to [GeoDCAT-AP](https://semiceu.github.io/GeoDCAT-AP/releases/) and [INSPIRE](https://inspire.ec.europa.eu/about-inspire). Also includes DCAT profile improvements and several enhancements like multilang for datasets, orgs and groups, themes, CLI, ... | +| Extension | [ckanext-openapi](https://github.com/mjanez/ckanext-openapi) | 1.0.0 | 🚧 WIP | ✔️ | ✔️ | Custom development to integrates and displays OpenAPI endpoints directly in the CKAN catalog. | | Extension | [ckanext-fluent](https://github.com/mjanez/ckanext-fluent) | v1.0.1 | 🚧 WIP | ✔️ | ✔️ | Multilingual fields for CKAN, custom version with fixes and enhancements. | | Software | [ckan-pycsw](https://github.com/mjanez/ckan-pycsw) | main | 🚧 WIP | ✔️ | ✔️ | PyCSW Endpoint of Open Data Portal with docker compose config. Harvest the CKAN catalogue in a CSW endpoint based on existing spatial datasets in the open data portal. | diff --git a/ckan/Dockerfile b/ckan/Dockerfile index 4faf320d..23e0bd51 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -23,7 +23,7 @@ COPY req_fixes req_fixes ## PDFView - 0.0.8 ## ## Fluent - v1.0.1 (mjanez/Forked stable version) ## ## OpenAPI - v1.0.0 (mjanez stable version) ## -## Scheming DCAT - v4.2.2 (mjanez/GeoDCAT-AP/NTI-RISP extended version) ## +## Scheming DCAT - v4.2.3 (mjanez/GeoDCAT-AP/NTI-RISP extended version) ## RUN echo ${TZ} > /etc/timezone && \ if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then cp /usr/share/zoneinfo/${TZ} /etc/localtime; fi && \ # Install patch utility @@ -60,7 +60,7 @@ RUN echo ${TZ} > /etc/timezone && \ echo "mjanez/ckanext-openapi" && \ pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-openapi.git@v1.0.0#egg=ckanext-openapi && \ echo "mjanez/ckanext-schemingdcat" && \ - pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-schemingdcat.git@v4.2.2#egg=ckanext_schemingdcat && \ + pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-schemingdcat.git@v4.2.3#egg=ckanext_schemingdcat && \ pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-schemingdcat/requirements.txt && \ # Remove system cache apt-get clean && \ diff --git a/samples/.env.codespaces b/samples/.env.codespaces index 3d1f82f4..6db307c1 100644 --- a/samples/.env.codespaces +++ b/samples/.env.codespaces @@ -227,7 +227,10 @@ CKANEXT__SCHEMINGDCAT__SOCIAL_X="https://x.com/ckanproject" CKANEXT__SCHEMINGDCAT__SOCIAL_LINKEDIN="https://www.linkedin.com/company/ckanproject" CKANEXT__SCHEMINGDCAT__OPEN_DATA_STATISTICS=True CKANEXT__SCHEMINGDCAT__OPEN_DATA_STATISTICS_THEMES=True +# Private fields to be hidden in the API responses +CKANEXT__SCHEMINGDCAT__API__PRIVATE_FIELDS="private_name private_email" CKANEXT__OPENAPI__ENDPOINTS='[{"url":"https://raw.githubusercontent.com/mjanez/ckanext-openapi/refs/heads/develop/ckanext/openapi/public/static/openapi/datastore.yaml","name":"datastore","title":{"en":"CKAN - Datastore API","es":"Portal de datos abiertos de CKAN - API Datastore"},"description":{"en":"This API provides live access to the Datastore portion of the CKAN Open Data Portal.","es":"Esta API proporciona acceso en tiempo real a la parte de Datastore del Portal de Datos Abiertos CKAN."}},{"url":"https://raw.githubusercontent.com/mjanez/ckanext-openapi/refs/heads/develop/ckanext/openapi/public/static/openapi/ckan.yaml","name":"ckan","title":{"en":"CKAN Open Data Portal - CKAN API (ES)","es":"Portal de datos abiertos de CKAN - API CKAN"},"description":{"en":"This API provides live access to the CKAN portion of the CKAN Open Data Portal.","es":"Esta API proporciona acceso en tiempo real a la parte de CKAN del Portal de Datos Abiertos CKAN."}}]' + # ckanext-pages CKANEXT__PAGES__ALOW_HTML=False CKANEXT__PAGES__ORGANIZATION=True diff --git a/samples/.env.dev.example b/samples/.env.dev.example index 7a299075..8d845b57 100644 --- a/samples/.env.dev.example +++ b/samples/.env.dev.example @@ -225,7 +225,10 @@ CKANEXT__SCHEMINGDCAT__SOCIAL_X="https://x.com/ckanproject" CKANEXT__SCHEMINGDCAT__SOCIAL_LINKEDIN="https://www.linkedin.com/company/ckanproject" CKANEXT__SCHEMINGDCAT__OPEN_DATA_STATISTICS=True CKANEXT__SCHEMINGDCAT__OPEN_DATA_STATISTICS_THEMES=True +# Private fields to be hidden in the API responses +CKANEXT__SCHEMINGDCAT__API__PRIVATE_FIELDS="private_name private_email" CKANEXT__OPENAPI__ENDPOINTS='[{"url":"https://raw.githubusercontent.com/mjanez/ckanext-openapi/refs/heads/develop/ckanext/openapi/public/static/openapi/datastore.yaml","name":"datastore","title":{"en":"CKAN - Datastore API","es":"Portal de datos abiertos de CKAN - API Datastore"},"description":{"en":"This API provides live access to the Datastore portion of the CKAN Open Data Portal.","es":"Esta API proporciona acceso en tiempo real a la parte de Datastore del Portal de Datos Abiertos CKAN."}},{"url":"https://raw.githubusercontent.com/mjanez/ckanext-openapi/refs/heads/develop/ckanext/openapi/public/static/openapi/ckan.yaml","name":"ckan","title":{"en":"CKAN Open Data Portal - CKAN API (ES)","es":"Portal de datos abiertos de CKAN - API CKAN"},"description":{"en":"This API provides live access to the CKAN portion of the CKAN Open Data Portal.","es":"Esta API proporciona acceso en tiempo real a la parte de CKAN del Portal de Datos Abiertos CKAN."}}]' + # ckanext-pages CKANEXT__PAGES__ALOW_HTML=False CKANEXT__PAGES__ORGANIZATION=True diff --git a/samples/.env.es.example b/samples/.env.es.example index 354d8332..4ef1616b 100644 --- a/samples/.env.es.example +++ b/samples/.env.es.example @@ -225,7 +225,10 @@ CKANEXT__SCHEMINGDCAT__SOCIAL_X="https://x.com/ckanproject" CKANEXT__SCHEMINGDCAT__SOCIAL_LINKEDIN="https://www.linkedin.com/company/ckanproject" CKANEXT__SCHEMINGDCAT__OPEN_DATA_STATISTICS=True CKANEXT__SCHEMINGDCAT__OPEN_DATA_STATISTICS_THEMES=True +# Private fields to be hidden in the API responses +CKANEXT__SCHEMINGDCAT__API__PRIVATE_FIELDS="private_name private_email" CKANEXT__OPENAPI__ENDPOINTS='[{"url":"https://raw.githubusercontent.com/mjanez/ckanext-openapi/refs/heads/develop/ckanext/openapi/public/static/openapi/datastore.yaml","name":"datastore","title":{"en":"CKAN - Datastore API","es":"Portal de datos abiertos de CKAN - API Datastore"},"description":{"en":"This API provides live access to the Datastore portion of the CKAN Open Data Portal.","es":"Esta API proporciona acceso en tiempo real a la parte de Datastore del Portal de Datos Abiertos CKAN."}},{"url":"https://raw.githubusercontent.com/mjanez/ckanext-openapi/refs/heads/develop/ckanext/openapi/public/static/openapi/ckan.yaml","name":"ckan","title":{"en":"CKAN Open Data Portal - CKAN API (ES)","es":"Portal de datos abiertos de CKAN - API CKAN"},"description":{"en":"This API provides live access to the CKAN portion of the CKAN Open Data Portal.","es":"Esta API proporciona acceso en tiempo real a la parte de CKAN del Portal de Datos Abiertos CKAN."}}]' + # ckanext-pages CKANEXT__PAGES__ALOW_HTML=False CKANEXT__PAGES__ORGANIZATION=True