From 9bb88897ac9375fb92891f1c9d817c6f0a8764d6 Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Fri, 22 Nov 2019 12:34:19 +0000
Subject: [PATCH 1/2] Fix for Travis build, now requirements.txt on master is
 for python3

---
 bin/travis-build.bash | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/travis-build.bash b/bin/travis-build.bash
index b9682ff4..f810c49b 100644
--- 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 -
 

From e0c829515e0225f00436fb35ffa3803d0b8aa7fe Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Fri, 22 Nov 2019 14:05:47 +0000
Subject: [PATCH 2/2] No point testing against unsupported CKAN versions

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c1376cfd..ce2f045f 100644
--- 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