From 362b1b3c4fcada7d65cc03f11cd9e2de1b9138a6 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 14 Aug 2017 19:19:20 -0300
Subject: [PATCH 1/2] Use tox release candidates in CI

Fix #2683
---
 .travis.yml  | 5 +++--
 appveyor.yml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d8d58328..5d37b9139 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 sudo: false
 language: python
 python:
-    - '3.5'
+  - '3.5'
 # command to install dependencies
-install: "pip install -U tox"
+install:
+  - pip install --upgrade --pre tox
 # # command to run tests
 env:
   matrix:
diff --git a/appveyor.yml b/appveyor.yml
index abf033b4c..3b7b989ac 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,7 @@ install:
 
   - if "%TOXENV%" == "pypy" call scripts\install-pypy.bat
 
-  - C:\Python35\python -m pip install tox
+  - C:\Python35\python -m pip install --upgrade --pre tox
 
 build: false  # Not a C# project, build stuff at the test step instead.
 

From 7b5d26c1a8dce2eff808dc03beb4034ae63f303e Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Mon, 14 Aug 2017 19:28:54 -0300
Subject: [PATCH 2/2] Use py36 as preferred Python 3 interpreter for CI testing

---
 .travis.yml          | 19 ++++++++++---------
 appveyor.yml         | 12 ++++++------
 scripts/call-tox.bat |  2 +-
 tox.ini              |  4 ++--
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5d37b9139..b9ced8646 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: python
 python:
-  - '3.5'
+  - '3.6'
 # command to install dependencies
 install:
   - pip install --upgrade --pre tox
@@ -14,18 +14,17 @@ env:
     - TOXENV=linting
     - TOXENV=py27
     - TOXENV=py34
-    - TOXENV=py35
+    - TOXENV=py36
     - TOXENV=py27-pexpect
     - TOXENV=py27-xdist
     - TOXENV=py27-trial
     - TOXENV=py27-numpy
-    - TOXENV=py35-pexpect
-    - TOXENV=py35-xdist
-    - TOXENV=py35-trial
-    - TOXENV=py35-numpy
+    - TOXENV=py36-pexpect
+    - TOXENV=py36-xdist
+    - TOXENV=py36-trial
+    - TOXENV=py36-numpy
     - TOXENV=py27-nobyte
     - TOXENV=doctesting
-    - TOXENV=freeze
     - TOXENV=docs
 
 matrix:
@@ -36,8 +35,10 @@ matrix:
       python: '3.3'
     - env: TOXENV=pypy
       python: 'pypy-5.4'
-    - env: TOXENV=py36
-      python: '3.6'
+    - env: TOXENV=py35
+      python: '3.5'
+    - env: TOXENV=py35-freeze
+      python: '3.5'
     - env: TOXENV=py37
       python: 'nightly'
   allow_failures:
diff --git a/appveyor.yml b/appveyor.yml
index 3b7b989ac..3a11700e3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,13 +21,13 @@ environment:
   - TOXENV: "py27-xdist"
   - TOXENV: "py27-trial"
   - TOXENV: "py27-numpy"
-  - TOXENV: "py35-pexpect"
-  - TOXENV: "py35-xdist"
-  - TOXENV: "py35-trial"
-  - TOXENV: "py35-numpy"
+  - TOXENV: "py36-pexpect"
+  - TOXENV: "py36-xdist"
+  - TOXENV: "py36-trial"
+  - TOXENV: "py36-numpy"
   - TOXENV: "py27-nobyte"
   - TOXENV: "doctesting"
-  - TOXENV: "freeze"
+  - TOXENV: "py35-freeze"
   - TOXENV: "docs"
 
 install:
@@ -36,7 +36,7 @@ install:
 
   - if "%TOXENV%" == "pypy" call scripts\install-pypy.bat
 
-  - C:\Python35\python -m pip install --upgrade --pre tox
+  - C:\Python36\python -m pip install --upgrade --pre tox
 
 build: false  # Not a C# project, build stuff at the test step instead.
 
diff --git a/scripts/call-tox.bat b/scripts/call-tox.bat
index 3ca9eb6d7..86fb25c1d 100644
--- a/scripts/call-tox.bat
+++ b/scripts/call-tox.bat
@@ -5,4 +5,4 @@ if "%TOXENV%" == "coveralls" (
         exit /b 0
     )
 )
-C:\Python35\python -m tox
+C:\Python36\python -m tox
diff --git a/tox.ini b/tox.ini
index 61a9ece8d..c6ce3e735 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ envlist =
     {py27,py35}-{pexpect,xdist,trial,numpy}
     py27-nobyte
     doctesting
-    freeze
+    py35-freeze
     docs
 
 [testenv]
@@ -169,7 +169,7 @@ changedir = testing
 commands =
     {envpython} {envbindir}/py.test-jython -rfsxX {posargs}
 
-[testenv:freeze]
+[testenv:py35-freeze]
 changedir = testing/freeze
 deps = pyinstaller
 commands =