From 6d0667f1dba390d7692d2c8157960a6f747ce291 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 14 Oct 2018 14:23:09 +0200
Subject: [PATCH 1/2] CI: run specialized factors in a single job

Given the setup time for jobs, it makes sense to run
*-pexpect,*-trial,*-numpy in a single build job.
---
 .travis.yml  | 20 ++++++++------------
 appveyor.yml | 15 ++++++---------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3936e599b..5c479feed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,19 +12,15 @@ install:
   - pip install --upgrade --pre tox
 env:
   matrix:
-    # note: please use "tox --listenvs" to populate the build matrix below
-    # please remove the linting env in all cases
-    - TOXENV=py27-pexpect
-    - TOXENV=py27-xdist
-    - TOXENV=py27-trial
-    - TOXENV=py27-numpy
-    - TOXENV=py27-pluggymaster PYTEST_NO_COVERAGE=1
-    - TOXENV=py36-pexpect
-    - TOXENV=py36-xdist
-    - TOXENV=py36-trial
-    - TOXENV=py36-numpy
-    - TOXENV=py36-pluggymaster PYTEST_NO_COVERAGE=1
+    # Specialized factors for py27.
+    - TOXENV=py27-pexpect,py27-trial,py27-numpy
     - TOXENV=py27-nobyte
+    - TOXENV=py27-xdist
+    - TOXENV=py27-pluggymaster PYTEST_NO_COVERAGE=1
+    # Specialized factors for py36.
+    - TOXENV=py36-pexpect,py36-trial,py36-numpy
+    - TOXENV=py36-xdist
+    - TOXENV=py36-pluggymaster PYTEST_NO_COVERAGE=1
 
 jobs:
   include:
diff --git a/appveyor.yml b/appveyor.yml
index efc880638..c8329c717 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,5 @@
 environment:
   matrix:
-  - TOXENV: "linting,docs,doctesting"
-    PYTEST_NO_COVERAGE: "1"
   - TOXENV: "py27"
   - TOXENV: "py34"
   - TOXENV: "py35"
@@ -9,19 +7,18 @@ environment:
   - TOXENV: "py37"
   - TOXENV: "pypy"
     PYTEST_NO_COVERAGE: "1"
-  - TOXENV: "py27-xdist"
-  - TOXENV: "py27-trial"
-  - TOXENV: "py27-numpy"
+  # Specialized factors for py27.
+  - TOXENV: "py27-trial,py27-numpy,py27-nobyte"
   - TOXENV: "py27-pluggymaster"
     PYTEST_NO_COVERAGE: "1"
-  - TOXENV: "py36-xdist"
-  - TOXENV: "py36-trial"
-  - TOXENV: "py36-numpy"
+  - TOXENV: "py27-xdist"
+  # Specialized factors for py36.
+  - TOXENV: "py36-trial,py36-numpy"
   - TOXENV: "py36-pluggymaster"
     PYTEST_NO_COVERAGE: "1"
-  - TOXENV: "py27-nobyte"
   - TOXENV: "py36-freeze"
     PYTEST_NO_COVERAGE: "1"
+  - TOXENV: "py36-xdist"
 
 install:
   - echo Installed Pythons

From 7ded937e19c4ceb5332dc9719b88ef8fcb78feb5 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 14 Oct 2018 14:24:28 +0200
Subject: [PATCH 2/2] AppVeyor: use fast_finish

This runs py27, py37 and linting first - simulating the baseline stage
used on Travis.
---
 appveyor.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c8329c717..abe431984 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,10 +1,12 @@
 environment:
   matrix:
   - TOXENV: "py27"
-  - TOXENV: "py34"
-  - TOXENV: "py35"
-  - TOXENV: "py36"
   - TOXENV: "py37"
+    PYTEST_NO_COVERAGE: "1"
+  - TOXENV: "linting,docs,doctesting"
+  - TOXENV: "py36"
+  - TOXENV: "py35"
+  - TOXENV: "py34"
   - TOXENV: "pypy"
     PYTEST_NO_COVERAGE: "1"
   # Specialized factors for py27.
@@ -20,6 +22,9 @@ environment:
     PYTEST_NO_COVERAGE: "1"
   - TOXENV: "py36-xdist"
 
+matrix:
+  fast_finish: true
+
 install:
   - echo Installed Pythons
   - dir c:\Python*