From 1c0b7c578360b95ad8a5747a79a5beb1c83b5fe5 Mon Sep 17 00:00:00 2001 From: tino097 <konstantin.sivakov@gmail.com> Date: Tue, 16 Jan 2024 23:50:44 +0100 Subject: [PATCH 1/6] Updat test.ini --- test.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test.ini b/test.ini index d5344ddc..d9bbb164 100644 --- a/test.ini +++ b/test.ini @@ -17,9 +17,10 @@ port = 5000 [app:main] -use = config:../ckan/test-core.ini +use = config:../../src/ckan/test-core.ini +ckan.site_id = test.ckan.net ckan.plugins = qa archiver report -ckanext.qa.qsv_bin = qsv +ckanext.qa.qsv_bin = /usr/local/bin/qsv # Here we hard-code the database and a flag to make default tests # run fast. From b68aa7296dd241c495a95d9401a9a3ea48171843 Mon Sep 17 00:00:00 2001 From: tino097 <konstantin.sivakov@gmail.com> Date: Wed, 24 Jan 2024 19:46:41 +0100 Subject: [PATCH 2/6] Fix typo in config variable --- ckanext/qa/plugin/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ckanext/qa/plugin/__init__.py b/ckanext/qa/plugin/__init__.py index 11d93579..625fe9ba 100644 --- a/ckanext/qa/plugin/__init__.py +++ b/ckanext/qa/plugin/__init__.py @@ -37,13 +37,13 @@ def update_config(self, config): toolkit.add_template_directory(config, '../templates') # check for qsv config - qsv_config = config.get('ckanext.qa.qsv_config') + qsv_config = config.get('ckanext.qa.qsv_bin') if not qsv_config: - log.error('ckanext.qa.qsv_config not set') + log.error('ckanext.qa.qsv_bin not set') if qsv_config: qsv_path = Path(qsv_config) if not qsv_path.is_file(): - log.error('ckanext.qa.qsv_config file not found: %s', qsv_path) + log.error('ckanext.qa.qsv_bin file not found: %s', qsv_path) # IPipe From 72a244b2a4c5b56f9b2271ddf4e15a17ee7b509c Mon Sep 17 00:00:00 2001 From: tino097 <konstantin.sivakov@gmail.com> Date: Wed, 24 Jan 2024 22:34:12 +0100 Subject: [PATCH 3/6] Update test with qsv path --- test.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.ini b/test.ini index d9bbb164..6a28eae1 100644 --- a/test.ini +++ b/test.ini @@ -20,7 +20,7 @@ port = 5000 use = config:../../src/ckan/test-core.ini ckan.site_id = test.ckan.net ckan.plugins = qa archiver report -ckanext.qa.qsv_bin = /usr/local/bin/qsv +ckanext.qa.qsv_bin = qsv # Here we hard-code the database and a flag to make default tests # run fast. From 0c899a4766eea08bf264766cdb208b485248db9d Mon Sep 17 00:00:00 2001 From: Mark Calvert <markcalvert84@gmail.com> Date: Wed, 31 Jan 2024 17:04:27 +1300 Subject: [PATCH 4/6] Removed qa from index which was causing solr errors --- ckanext/qa/plugin/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ckanext/qa/plugin/__init__.py b/ckanext/qa/plugin/__init__.py index 625fe9ba..6d50a160 100644 --- a/ckanext/qa/plugin/__init__.py +++ b/ckanext/qa/plugin/__init__.py @@ -121,3 +121,10 @@ def after_dataset_show(self, context, pkg_dict): del qa_dict['package_id'] del qa_dict['resource_id'] res['qa'] = qa_dict + + def before_dataset_index(self, pkg_dict): + ''' + remove `qa` from index + ''' + pkg_dict.pop('qa', None) + return pkg_dict \ No newline at end of file From e6ff60ad287431d7e4b54386f3ca8dc247bcb546 Mon Sep 17 00:00:00 2001 From: Mark Calvert <markcalvert84@gmail.com> Date: Wed, 31 Jan 2024 17:07:55 +1300 Subject: [PATCH 5/6] Fixing lint issues --- ckanext/qa/plugin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckanext/qa/plugin/__init__.py b/ckanext/qa/plugin/__init__.py index 6d50a160..5b9bda28 100644 --- a/ckanext/qa/plugin/__init__.py +++ b/ckanext/qa/plugin/__init__.py @@ -127,4 +127,4 @@ def before_dataset_index(self, pkg_dict): remove `qa` from index ''' pkg_dict.pop('qa', None) - return pkg_dict \ No newline at end of file + return pkg_dict From 236a7e0db647d900e575d41a12e769c6402e06e5 Mon Sep 17 00:00:00 2001 From: Mark Calvert <markcalvert84@gmail.com> Date: Thu, 1 Feb 2024 09:37:01 +1300 Subject: [PATCH 6/6] Updated variable name to match config name Refactored logic --- ckanext/qa/plugin/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ckanext/qa/plugin/__init__.py b/ckanext/qa/plugin/__init__.py index 5b9bda28..6c646817 100644 --- a/ckanext/qa/plugin/__init__.py +++ b/ckanext/qa/plugin/__init__.py @@ -37,13 +37,13 @@ def update_config(self, config): toolkit.add_template_directory(config, '../templates') # check for qsv config - qsv_config = config.get('ckanext.qa.qsv_bin') - if not qsv_config: - log.error('ckanext.qa.qsv_bin not set') - if qsv_config: - qsv_path = Path(qsv_config) + qsv_bin = config.get('ckanext.qa.qsv_bin') + if qsv_bin: + qsv_path = Path(qsv_bin) if not qsv_path.is_file(): log.error('ckanext.qa.qsv_bin file not found: %s', qsv_path) + else: + log.error('ckanext.qa.qsv_bin not set') # IPipe