Merge pull request #62 from qld-gov-au/develop

Develop to master - move inter-plugin dependency out of main requirements file

.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

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.

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/[email protected]#egg=ckanext-scheming

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/[email protected]#egg=ckanext-scheming

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/[email protected]#egg=ckanext-scheming

requirements.txt

@@ -1,4 +1,5 @@
 ckantoolkit>=0.0.4
 goodtables==1.5.1
 six>=1.13.0
--e git+https://github.com/ckan/[email protected]#egg=ckanext-scheming
+datapackage==1.15.2 # pin to preserve compatibility with older tableschema
+ckanext-scheming