From 6bd6da574b6a3328ff669f8c30e5cac7c965a6b1 Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Wed, 8 May 2024 17:07:14 +1000 Subject: [PATCH 1/4] [QOLDEV-833] adjust source installation requirements - Main requirements file should just require the egg, not specify the source. Test files can specify the source. --- dev-requirements-2.9-py2.txt | 2 ++ dev-requirements-py2.txt | 2 ++ dev-requirements.txt | 2 ++ requirements.txt | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-requirements-2.9-py2.txt b/dev-requirements-2.9-py2.txt index 358f581c..cf5b6939 100644 --- a/dev-requirements-2.9-py2.txt +++ b/dev-requirements-2.9-py2.txt @@ -13,3 +13,5 @@ selenium==3.141.0 splinter>=0.13.0,<0.17 responses==0.17.0 faker==3.0.1 + +git+https://github.com/ckan/ckanext-scheming.git@release-3.0.0#egg=ckanext-scheming diff --git a/dev-requirements-py2.txt b/dev-requirements-py2.txt index dcf8e9ae..c3d1d62d 100644 --- a/dev-requirements-py2.txt +++ b/dev-requirements-py2.txt @@ -13,3 +13,5 @@ selenium==3.141.0 splinter>=0.13.0,<0.17 responses==0.17.0 faker==3.0.1 + +git+https://github.com/ckan/ckanext-scheming.git@release-3.0.0#egg=ckanext-scheming diff --git a/dev-requirements.txt b/dev-requirements.txt index c2e6f1dc..15cb37c5 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -10,3 +10,5 @@ pytest-cov selenium==4.8.2 splinter>=0.13.0 faker==18.3.0 + +git+https://github.com/ckan/ckanext-scheming.git@release-3.0.0#egg=ckanext-scheming diff --git a/requirements.txt b/requirements.txt index 305711e0..2fa1a92a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ ckantoolkit>=0.0.4 goodtables==1.5.1 six>=1.13.0 --e git+https://github.com/ckan/ckanext-scheming.git@release-3.0.0#egg=ckanext-scheming +ckanext-scheming From 4bf02fc905cc9ead14cf2b9aeed7338cad54ff96 Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Wed, 8 May 2024 17:13:35 +1000 Subject: [PATCH 2/4] [QOLDEV-833] pin Click to a version that works even if the requirement files disagree --- bin/init-ext.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/init-ext.sh b/bin/init-ext.sh index 20b0a63c..a91ed5b9 100755 --- a/bin/init-ext.sh +++ b/bin/init-ext.sh @@ -39,6 +39,8 @@ for extension in . `ls -d $SRC_DIR/ckanext-*`; do install_requirements $extension requirements pip-requirements done pip install -e . +# force version that declares itself to be incompatible but actually works +pip install click==7.1.2 installed_name=$(grep '^\s*name=' setup.py |sed "s|[^']*'\([-a-zA-Z0-9]*\)'.*|\1|") # Validate that the extension was installed correctly. From 4ffe26fba76ce7ef8fce85dd56aae5eaccbfa4e8 Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Thu, 9 May 2024 08:29:54 +1000 Subject: [PATCH 3/4] [QOLDEV-833] drop Python 2 tests - Python 2 is long obsolete, CKAN 2.8 (which relied on it) is no longer supported --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 38b3f635..db3a8e2c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - ckan-version: ["2.10", 2.9, 2.9-py2] + ckan-version: ["2.10", 2.9] name: Continuous Integration build on CKAN ${{ matrix.ckan-version }} runs-on: ubuntu-latest From 401b85a5b5634a8d72d87b98bc33fc9c91329c5a Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Thu, 9 May 2024 13:19:30 +1000 Subject: [PATCH 4/4] [QOLDEV-833] pin 'datapackage' for compatibility with older tableschema - TODO Update Validation to use Frictionless instead of Goodtables so we can clean this up --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 2fa1a92a..9b8d2fd4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ ckantoolkit>=0.0.4 goodtables==1.5.1 six>=1.13.0 +datapackage==1.15.2 # pin to preserve compatibility with older tableschema ckanext-scheming