From 0e5c96ef3710612bf1171e7094cf7d5427387ecb Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Thu, 19 May 2016 14:42:52 -0400
Subject: [PATCH 1/3] Drop "Galaxy pip" in favor of manylinux1 wheels (which
 are supported in pip >= 8.1).

---
 scripts/common_startup.sh | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index 405cbfedb09..bd073a53235 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -134,31 +134,7 @@ fi
 
 : ${GALAXY_WHEELS_INDEX_URL:="https://wheels.galaxyproject.org/simple"}
 if [ $REPLACE_PIP -eq 1 ]; then
-    pip_version=`pip --version | awk '{print $2}'`
-    method=`python - << EOF
-from pkg_resources import parse_version
-from sys import stdout
-if parse_version('$pip_version') >= parse_version('6.0'):
-    stdout.write('req')
-elif parse_version('$pip_version') >= parse_version('1.5'):
-    stdout.write('wheel')
-else:
-    stdout.write('sdist')
-EOF`
-    case $method in
-        req)
-            pip install --no-index --find-links ${GALAXY_WHEELS_INDEX_URL}/pip --upgrade "pip==${GXPIP_VERSION}"
-            ;;
-        wheel)
-            pip install --upgrade "https://wheels.galaxyproject.org/packages/pip-${GXPIP_VERSION}-py2.py3-none-any.whl"
-            ;;
-        sdist)
-            pip install --upgrade "https://wheels.galaxyproject.org/packages/pip-${GXPIP_VERSION}.tar.gz"
-            ;;
-    esac
-
-    # binary-compatibility.cfg may need to be created (e.g. on CentOS)
-    [ -n "$VIRTUAL_ENV" -a ! -f ${VIRTUAL_ENV}/binary-compatibility.cfg ] && python ./scripts/binary_compatibility.py -o ${VIRTUAL_ENV}/binary-compatibility.cfg
+    pip install 'pip>=8.1'
 fi
 
 if [ $FETCH_WHEELS -eq 1 ]; then

From b10cfa43ac547eaecbd996cef7201170a0e0da8c Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Fri, 20 May 2016 09:44:55 -0400
Subject: [PATCH 2/3] Remove unused $GXPIP_VERSION

---
 scripts/common_startup.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index bd073a53235..97b3c446609 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 set -e
 
-GXPIP_VERSION='8.0.2+gx2'
-
 SET_VENV=1
 for arg in "$@"; do
     [ "$arg" = "--skip-venv" ] && SET_VENV=0

From efe84751a7bf84b2297df7b77b514b8425fe7c70 Mon Sep 17 00:00:00 2001
From: Nicola Soranzo <nicola.soranzo@earlham.ac.uk>
Date: Mon, 26 Nov 2018 16:30:00 +0000
Subject: [PATCH 3/3] Add workaround for
 https://github.com/travis-ci/travis-ci/issues/7940

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

diff --git a/.travis.yml b/.travis.yml
index 6e1c444185d..dcb42ef598c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ env:
   - TOX_ENV=py26-unit
   - TOX_ENV=qunit
 
+before_install:
+  # Workaround for https://github.com/travis-ci/travis-ci/issues/7940
+  - sudo rm -f /etc/boto.cfg
+
 install:
   - pip install tox
   - if [ "$TOX_ENV" == "qunit" ]; then bash -c 'cd test/qunit && npm install'; fi