From 2a7eb4d8da5fb3beb6a694da3bf3de8536b54a77 Mon Sep 17 00:00:00 2001 From: Christopher Hedrick Date: Thu, 10 Apr 2025 11:19:21 -0400 Subject: [PATCH 1/4] switch test.yml docker image to be ckan and not openknowledge --- .github/workflows/ckan-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ckan-test.yml b/.github/workflows/ckan-test.yml index 2771e21ba..d89a7cbd4 100644 --- a/.github/workflows/ckan-test.yml +++ b/.github/workflows/ckan-test.yml @@ -41,7 +41,7 @@ jobs: name: CKAN ${{ matrix.ckan-version }} runs-on: ubuntu-latest container: - image: openknowledge/ckan-dev:${{ matrix.ckan-version }} + image: ckan/ckan-dev:${{ matrix.ckan-version }} services: solr: image: datagov/catalog.data.gov.solr:latest From c0ed70d938a03ed46b976c46f2adb2b91c392a30 Mon Sep 17 00:00:00 2001 From: Christopher Hedrick Date: Fri, 11 Apr 2025 12:33:08 -0400 Subject: [PATCH 2/4] rm sudo --- .github/workflows/ckan-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ckan-test.yml b/.github/workflows/ckan-test.yml index d89a7cbd4..61bf9f478 100644 --- a/.github/workflows/ckan-test.yml +++ b/.github/workflows/ckan-test.yml @@ -74,8 +74,8 @@ jobs: - uses: actions/checkout@v4 - name: Install requirements run: | - sudo apk add tzdata swig python3-dev - sudo apk add proj-util proj-dev geos-dev + apk add tzdata swig python3-dev + apk add proj-util proj-dev geos-dev cp /usr/share/zoneinfo/America/New_York /etc/localtime if [[ -f requirements.txt ]]; then pip install -r requirements.txt From 6d65459420b28f4f5babf0d60325dd6cd54024df Mon Sep 17 00:00:00 2001 From: Christopher Hedrick Date: Wed, 16 Apr 2025 11:24:33 -0400 Subject: [PATCH 3/4] force the use of this version of packaging --- requirements.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..4073f8c3d --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +packaging==21.3 \ No newline at end of file From 3e9e85d15e4180df5cb92200b2a2b231c3caa93a Mon Sep 17 00:00:00 2001 From: Christopher Hedrick Date: Wed, 16 Apr 2025 11:33:23 -0400 Subject: [PATCH 4/4] test different package setting --- .github/workflows/ckan-test.yml | 1 + requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 requirements.txt diff --git a/.github/workflows/ckan-test.yml b/.github/workflows/ckan-test.yml index 61bf9f478..a098d6596 100644 --- a/.github/workflows/ckan-test.yml +++ b/.github/workflows/ckan-test.yml @@ -83,6 +83,7 @@ jobs: if [[ -f dev-requirements.txt ]]; then pip install -r dev-requirements.txt fi + pip install packaging==21.3 pip install -e . - name: Setup extension (CKAN >= 2.9) run: | diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 4073f8c3d..000000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -packaging==21.3 \ No newline at end of file