matplotlib
diff --git a/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+1-3Lines changed: 1 addition & 3 deletions b/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/‎ci/travis/test_script.sh
Copy file name to clipboardExpand all lines: ci/travis/test_script.sh
+3-7Lines changed: 3 additions & 7 deletions b/‎ci/travis/test_script.sh
Copy file name to clipboardExpand all lines: ci/travis/test_script.sh
+3-7Lines changed: 3 additions & 7 deletions
@@ -48,7 +48,6 @@ env:
     - PYTEST_ARGS="-ra --maxfail=1 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
     - PYTHON_ARGS=
     - DELETE_FONT_CACHE=
-    - USE_PYTEST=false
 
 matrix:
   include:
@@ -61,7 +60,7 @@ matrix:
     - python: 3.5
       env: BUILD_DOCS=true
     - python: 3.6
-      env: USE_PYTEST=true DELETE_FONT_CACHE=1 INSTALL_PEP8=pytest-pep8 RUN_PEP8=--pep8
+      env: DELETE_FONT_CACHE=1 INSTALL_PEP8=pytest-pep8 RUN_PEP8=--pep8
     - python: "nightly"
       env: PRE=--pre
     - os: osx
@@ -80,7 +79,6 @@ matrix:
           - $HOME/.cache/matplotlib
   allow_failures:
     - python: "nightly"
-    - python: 2.7
 
 before_install:
   - |
 
@@ -23,14 +23,10 @@ if [[ $BUILD_DOCS == false ]]; then
   echo PYTHONHASHSEED=$PYTHONHASHSEED
 
   echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
-  if [[ $USE_PYTEST == false ]]; then
-    if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-      python tests.py $PYTEST_ARGS $RUN_PEP8
-    else
-      gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS tests.py $PYTEST_ARGS $RUN_PEP8
-    fi
+  if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+    python tests.py $PYTEST_ARGS $RUN_PEP8
   else
-    py.test $PYTEST_ARGS $RUN_PEP8
+    gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS tests.py $PYTEST_ARGS $RUN_PEP8
   fi
 else
   cd doc