Merge pull request ckan#70 from ckan/fix-travis-requirements-py2

Fix for Travis build, now requirements.txt on master is for python3
GeoinformationSystems · Nov 22, 2019 · 9ddaa1a · 9ddaa1a
2 parents 2166591 + e0c8295
commit 9ddaa1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,6 @@ python:
     - "2.7"
 env:
     - CKANVERSION=master
-    - CKANVERSION=2.2
-    - CKANVERSION=2.3
-    - CKANVERSION=2.4
-    - CKANVERSION=2.5
     - CKANVERSION=2.6
     - CKANVERSION=2.7
     - CKANVERSION=2.8

diff --git a/bin/travis-build.bash b/bin/travis-build.bash
@@ -21,7 +21,12 @@ else
     echo "CKAN version: ${CKAN_TAG#ckan-}"
 fi
 python setup.py develop
-pip install -r requirements.txt --allow-all-external
+if [ -f requirements-py2.txt ]
+then
+    pip install -r requirements-py2.txt
+else
+    pip install -r requirements.txt
+fi
 pip install -r dev-requirements.txt --allow-all-external
 cd -