From bb48f75a89379a4e03e4cb6a8c8e9894fd7898d5 Mon Sep 17 00:00:00 2001 From: german Date: Tue, 26 Nov 2024 11:49:58 -0300 Subject: [PATCH 1/3] Agregando extension anuncios --- .github/workflows/test-unckan-extension.yml | 2 ++ ckanext-unckan/test.ini | 2 +- docker/ckan/files/ckan.ini | 2 +- docker/ckan/files/scripts/entrypoint.sh | 2 ++ docker/ckan/files/scripts/install-extensions.sh | 4 ++++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-unckan-extension.yml b/.github/workflows/test-unckan-extension.yml index e138144..515de82 100644 --- a/.github/workflows/test-unckan-extension.yml +++ b/.github/workflows/test-unckan-extension.yml @@ -80,6 +80,8 @@ jobs: ckan -c test.ini db upgrade -p api_tracking # echo "Applying migrations for superset" # ckan -c test.ini db upgrade -p superset + # echo "Applying migrations for announcements" + # ckan -c test.ini db upgrade -p announcements - name: Run tests shell: bash diff --git a/ckanext-unckan/test.ini b/ckanext-unckan/test.ini index 1e6d601..214a8c8 100644 --- a/ckanext-unckan/test.ini +++ b/ckanext-unckan/test.ini @@ -8,7 +8,7 @@ use = config:../../ckan/test-core.ini # Insert any custom config settings to be used when running your extension's # tests here. These will override the one defined in CKAN core's test-core.ini -ckan.plugins = unckan pdf_view datapusher_plus api_tracking superset +ckan.plugins = unckan pdf_view datapusher_plus api_tracking superset announcements # Logging configuration [loggers] diff --git a/docker/ckan/files/ckan.ini b/docker/ckan/files/ckan.ini index 09cd56d..fa632c0 100644 --- a/docker/ckan/files/ckan.ini +++ b/docker/ckan/files/ckan.ini @@ -138,7 +138,7 @@ ckan.cors.origin_allow_all = false ckan.cors.origin_whitelist = ## Plugins Settings ############################################################ -ckan.plugins = unckan image_view pdf_view datastore datatables_view datapusher_plus api_tracking superset +ckan.plugins = unckan image_view pdf_view datastore datatables_view datapusher_plus api_tracking superset announcements ckan.resource_proxy.timeout = 5 ## Front-End Settings ########################################################## diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh index 7869588..cde5383 100755 --- a/docker/ckan/files/scripts/entrypoint.sh +++ b/docker/ckan/files/scripts/entrypoint.sh @@ -33,6 +33,8 @@ echo "Applying migrations for tracking" ckan db upgrade -p api_tracking # echo "Applying migrations for superset" # ckan db upgrade -p superset +echo "Applying migrations for announcements" +ckan db upgrade -p announcements # Rebuild search index ckan search-index rebuild diff --git a/docker/ckan/files/scripts/install-extensions.sh b/docker/ckan/files/scripts/install-extensions.sh index ff86aad..57e426a 100755 --- a/docker/ckan/files/scripts/install-extensions.sh +++ b/docker/ckan/files/scripts/install-extensions.sh @@ -41,4 +41,8 @@ echo "Installing Apache Superset extension" pip install -e git+https://github.com/unckan/ckanext-superset.git@0.1.3#egg=ckanext-superset pip install -r https://raw.githubusercontent.com/unckan/ckanext-superset/refs/tags/0.1.3/requirements.txt +echo "Installing Announcements extension" +pip install -e git+https://github.com/okfn/ckanext-announcements.git@0.1.3#egg=ckanext-announcements +pip install -r https://raw.githubusercontent.com/okfn/ckanext-announcements/refs/tags/0.1.3/requirements.txt + echo "CKAN extensions installed" From 63622a3fc87fc3da5e4fff99fd4181116ee59bee Mon Sep 17 00:00:00 2001 From: german Date: Tue, 26 Nov 2024 12:09:45 -0300 Subject: [PATCH 2/3] test --- .github/workflows/test-unckan-extension.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-unckan-extension.yml b/.github/workflows/test-unckan-extension.yml index 515de82..456d150 100644 --- a/.github/workflows/test-unckan-extension.yml +++ b/.github/workflows/test-unckan-extension.yml @@ -80,8 +80,8 @@ jobs: ckan -c test.ini db upgrade -p api_tracking # echo "Applying migrations for superset" # ckan -c test.ini db upgrade -p superset - # echo "Applying migrations for announcements" - # ckan -c test.ini db upgrade -p announcements + echo "Applying migrations for announcements" + ckan -c test.ini db upgrade -p announcements - name: Run tests shell: bash From 2268da14a8855537f34ac1bfddb566db0fd3405a Mon Sep 17 00:00:00 2001 From: german Date: Tue, 26 Nov 2024 13:11:49 -0300 Subject: [PATCH 3/3] agregando install a test-unckan-extension --- .github/workflows/test-unckan-extension.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-unckan-extension.yml b/.github/workflows/test-unckan-extension.yml index 456d150..7436bbf 100644 --- a/.github/workflows/test-unckan-extension.yml +++ b/.github/workflows/test-unckan-extension.yml @@ -62,6 +62,9 @@ jobs: pip install -r requirements.txt pip install -r dev-requirements.txt pip install -e . + echo "Installing Announcements extension" + pip install -e git+https://github.com/okfn/ckanext-announcements.git@0.1.3#egg=ckanext-announcements + pip install -r https://raw.githubusercontent.com/okfn/ckanext-announcements/refs/tags/0.1.3/requirements.txt - name: Setup extension shell: bash