From 28c13c75b275b8f488e294483c75294c106d8dfe Mon Sep 17 00:00:00 2001 From: Chris Daly Date: Tue, 5 Nov 2024 16:05:03 +0000 Subject: [PATCH 1/3] UKDSB-485 Updated .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 0114c21..6e90f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ __pycache__/ # Distribution / packaging .Python env/ +venv/ build/ develop-eggs/ dist/ @@ -41,3 +42,6 @@ coverage.xml # Sphinx documentation docs/_build/ *.log + +# JetBrains +*.idea \ No newline at end of file From 4fa5444d2d048baf2ccf2da23c60d0b4790d8416 Mon Sep 17 00:00:00 2001 From: Chris Daly Date: Tue, 5 Nov 2024 16:07:07 +0000 Subject: [PATCH 2/3] UKDSB-485 Updated plugin.py to make method changes, outlined in https://github.com/ckan/ckan/pull/7976. This will enable the plugin to work with CKAN 2.11 --- .../plugin.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ckanext/customised_fields_from_tag_vocabulary/plugin.py b/ckanext/customised_fields_from_tag_vocabulary/plugin.py index 96c9ecc..cee9267 100644 --- a/ckanext/customised_fields_from_tag_vocabulary/plugin.py +++ b/ckanext/customised_fields_from_tag_vocabulary/plugin.py @@ -77,30 +77,30 @@ def authz_remove_role(self, object_role): def delete(self, entity): pass - def before_search(self, search_params): + def before_dataset_search(self, search_params): return search_params - def after_search(self, search_results, search_params): + def after_dataset_search(self, search_results, search_params): return search_results - def before_index(self, data_dict): + def before_dataset_index(self, data_dict): data_dict.pop('wkt', None) data_dict.pop('extras_wkt', None) return data_dict - def before_view(self, pkg_dict): + def before_dataset_view(self, pkg_dict): return pkg_dict - def after_create(self, context, data_dict): + def after_dataset_create(self, context, data_dict): return data_dict - def after_update(self, context, data_dict): + def after_dataset_update(self, context, data_dict): return data_dict - def after_delete(self, context, data_dict): + def after_dataset_delete(self, context, data_dict): return data_dict - def after_show(self, context, data_dict): + def after_datset_show(self, context, data_dict): return data_dict # IConfigurer From 269d5f6c1d36c1bd9b6d1c8a6ac1ac3bab8a8f97 Mon Sep 17 00:00:00 2001 From: Chris Daly Date: Tue, 5 Nov 2024 16:28:09 +0000 Subject: [PATCH 3/3] UKDSB-485 Updated test.yml to add CKAN version 2.11 --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 905bd34..1d6ab32 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,12 +7,12 @@ jobs: # The CKAN version tag of the Solr and Postgres containers should match # the one of the container the tests run on. # You can switch this base image with a custom image tailored to your project - image: openknowledge/ckan-dev:2.9 + image: ckan/ckan-dev:2.11 services: solr: - image: ckan/ckan-solr-dev:2.9 + image: ckan/ckan-solr:2.11-solr9 postgres: - image: ckan/ckan-postgres-dev:2.9 + image: ckan/ckan-postgres-dev:2.10 env: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres