From bd93d66c4764b8ed284a16682da500b3628efc20 Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack.wilsdon@gmail.com>
Date: Fri, 3 Jun 2016 02:42:50 +0100
Subject: [PATCH] Remove unneeded environment variables in tests

---
 .travis.yml  | 21 +++++++++++++--------
 appveyor.yml |  9 ++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d07277cba..d5611deb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,27 @@
 language: python
 sudo: false
 
+env:
+    global:
+        # Undocumented feature of nose-show-skipped.
+        NOSE_SHOW_SKIPPED: 1
+
 matrix:
     include:
         - python: 2.7
-          env: {TOX_ENV: py27-test, TOX_ARGS: --show-skipped --with-coverage, COVERAGE: 1}
+          env: {TOX_ENV: py27-cov, COVERAGE: 1}
         - python: 3.3
-          env: {TOX_ENV: py33-test, TOX_ARGS: --show-skipped}
+          env: {TOX_ENV: py33-test}
         - python: 3.4
-          env: {TOX_ENV: py34-test, TOX_ARGS: --show-skipped}
+          env: {TOX_ENV: py34-test}
         - python: 3.5
-          env: {TOX_ENV: py35-test, TOX_ARGS: --show-skipped}
+          env: {TOX_ENV: py35-test}
         - python: pypy
-          env: {TOX_ENV: pypy-test, TOX_ARGS: --show-skipped}
+          env: {TOX_ENV: pypy-test}
         - python: 2.7
-          env: {TOX_ENV: py27-flake8, TOX_ARGS: --min-version=2.7}
+          env: {TOX_ENV: py27-flake8}
         - python: 3.3
-          env: {TOX_ENV: py33-flake8, TOX_ARGS: --min-version=3.3}
+          env: {TOX_ENV: py33-flake8}
         - python: 2.7
           env: {TOX_ENV: docs}
     allow_failures:
@@ -37,7 +42,7 @@ install:
     - travis_retry pip install tox sphinx
     - travis_retry tox -e $TOX_ENV --notest
 
-script: tox -e $TOX_ENV -- $TOX_ARGS
+script: tox -e $TOX_ENV
 
 # Report coverage to codecov.io.
 before_install:
diff --git a/appveyor.yml b/appveyor.yml
index 6e79877f6..ca9e5a520 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,19 +3,18 @@ build: off
 deploy: off
 
 environment:
+    # Undocumented feature of nose-show-skipped.
+    NOSE_SHOW_SKIPPED: 1
+
     matrix:
         - PYTHON: C:\Python27
           TOX_ENV: py27-test
-          TOX_ARGS: --show-skipped
         - PYTHON: C:\Python33
           TOX_ENV: py33-test
-          TOX_ARGS: --show-skipped
         - PYTHON: C:\Python34
           TOX_ENV: py34-test
-          TOX_ARGS: --show-skipped
         - PYTHON: C:\Python35
           TOX_ENV: py35-test
-          TOX_ARGS: --show-skipped
 
 # Install Tox for running tests.
 install:
@@ -23,7 +22,7 @@ install:
     - "%PYTHON%/Scripts/tox.exe -e %TOX_ENV% --notest"
 
 test_script:
-    - "%PYTHON%/Scripts/tox.exe -e %TOX_ENV% -- %TOX_ARGS%"
+    - "%PYTHON%/Scripts/tox.exe -e %TOX_ENV%"
 
 # Allow all failures for now: the tests don't yet pass!
 matrix: