From 53836a50a725e6b0f09c0192aa3d038ed21ef7a4 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Wed, 27 Sep 2017 23:31:48 +0200
Subject: [PATCH 1/5] Use Python 3.5 on Travis to avoid pyenv issues

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e288f32..e4e64a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: python
-python: 3.6
+python: 3.5
 env:  # $ tox -l | sort | xargs -I _ echo '  - TOXENV=_'
   - TOXENV=flake8
   - TOXENV=py27-django18

From 4885b2e25995f820870f2fa662c12cd6eecba2ce Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Thu, 28 Sep 2017 00:29:47 +0200
Subject: [PATCH 2/5] Add basepythons explicitly to tox configuration

---
 tox.ini | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tox.ini b/tox.ini
index 412e495..21911e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,12 @@ envlist =
     docs
 
 [testenv]
+basepython =
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    py35: python3.5
+    py36: python3.6
 deps =
     pytest
     django18: Django>=1.8,<1.9

From b8304c106289040073e71e7bd4271482ac0b6578 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Thu, 28 Sep 2017 01:18:54 +0200
Subject: [PATCH 3/5] Add workaround for Travis not supporting Python 3.5 and
 3.6

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

diff --git a/.travis.yml b/.travis.yml
index e4e64a4..b3fdf87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: python
-python: 3.5
+python: 3.6
+before_install:
+  # as suggested in https://github.com/travis-ci/travis-ci/issues/4990#issuecomment-297863117
+  - if [[ $TOXENV = py35 && -f ~/virtualenv/python3.5/bin/activate ]]; then source ~/virtualenv/python3.5/bin/activate; fi
 env:  # $ tox -l | sort | xargs -I _ echo '  - TOXENV=_'
   - TOXENV=flake8
   - TOXENV=py27-django18

From dd22906d2e913c9a1eeb5ce591c175a515e915ea Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Thu, 28 Sep 2017 01:25:25 +0200
Subject: [PATCH 4/5] Set global basepython for py35 (Travis image bug)

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b3fdf87..da2be13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
 language: python
 python: 3.6
-before_install:
-  # as suggested in https://github.com/travis-ci/travis-ci/issues/4990#issuecomment-297863117
-  - if [[ $TOXENV = py35 && -f ~/virtualenv/python3.5/bin/activate ]]; then source ~/virtualenv/python3.5/bin/activate; fi
 env:  # $ tox -l | sort | xargs -I _ echo '  - TOXENV=_'
   - TOXENV=flake8
   - TOXENV=py27-django18
@@ -15,6 +12,9 @@ env:  # $ tox -l | sort | xargs -I _ echo '  - TOXENV=_'
   - TOXENV=py35-django110
   - TOXENV=py35-django111
   - TOXENV=py36-django111
+before_install:
+  # work around https://github.com/travis-ci/travis-ci/issues/8363
+  - pyenv global system 3.5
 install:
   - pip install tox
 script: tox

From ba6ad8c482c9b8112221fd7882beb67e446028c2 Mon Sep 17 00:00:00 2001
From: Peter Bittner <django@bittner.it>
Date: Thu, 28 Sep 2017 01:30:31 +0200
Subject: [PATCH 5/5] Remove optional basepython declarations for tox

---
 tox.ini | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 21911e5..412e495 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,12 +12,6 @@ envlist =
     docs
 
 [testenv]
-basepython =
-    py27: python2.7
-    py33: python3.3
-    py34: python3.4
-    py35: python3.5
-    py36: python3.6
 deps =
     pytest
     django18: Django>=1.8,<1.9