Revert "more verbose on tests"

This reverts commit 92fe5f5.

Author: jreback

.travis.yml

@@ -31,31 +31,31 @@ matrix:
       # Exclude the default Python 3.5 build
       - python: 3.5
     include:
-#    - os: osx
-#      language: generic
-#      env:
-#        - JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network"
+    - os: osx
+      language: generic
+      env:
+        - JOB="3.5_OSX" TEST_ARGS="--skip-slow --skip-network"
     - dist: trusty
       env:
         - JOB="2.7_LOCALE" TEST_ARGS="--only-slow --skip-network" LOCALE_OVERRIDE="zh_CN.UTF-8"
       addons:
         apt:
           packages:
           - language-pack-zh-hans
-#    - dist: trusty
-#      env:
-#        - JOB="2.7" TEST_ARGS="--skip-slow" LINT=true
-#      addons:
-#        apt:
-#          packages:
-#          - python-gtk2
-#    - dist: trusty
-#      env:
-#        - JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
-#      addons:
-#        apt:
-#          packages:
-#          - xsel
+    - dist: trusty
+      env:
+        - JOB="2.7" TEST_ARGS="--skip-slow" LINT=true
+      addons:
+        apt:
+          packages:
+          - python-gtk2
+    - dist: trusty
+      env:
+        - JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
+      addons:
+        apt:
+          packages:
+          - xsel
     - dist: trusty
       env:
         - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
@@ -68,30 +68,30 @@ matrix:
       env:
         - JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
     # In allow_failures
-#    - dist: trusty
-#      env:
-#        - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
+    - dist: trusty
+      env:
+        - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
     # In allow_failures
-#    - dist: trusty
-#      env:
-#        - JOB="3.6_DOC" DOC=true
-#      addons:
-#        apt:
-#          packages:
-#          - xsel
+    - dist: trusty
+      env:
+        - JOB="3.6_DOC" DOC=true
+      addons:
+        apt:
+          packages:
+          - xsel
     allow_failures:
       - dist: trusty
         env:
           - JOB="2.7_SLOW" TEST_ARGS="--only-slow --skip-network"
       - dist: trusty
         env:
           - JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
-#      - dist: trusty
-#        env:
-#          - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
-#      - dist: trusty
-#        env:
-#          - JOB="3.6_DOC" DOC=true
+      - dist: trusty
+        env:
+          - JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"
+      - dist: trusty
+        env:
+          - JOB="3.6_DOC" DOC=true
 
 before_install:
   - echo "before_install"

ci/install_travis.sh

@@ -47,7 +47,7 @@ which conda
 echo
 echo "[update conda]"
 conda config --set ssl_verify false || exit 1
-conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
+conda config --set always_yes true --set changeps1 false || exit 1
 conda update -q conda
 
 echo

ci/script_multi.sh

@@ -38,8 +38,7 @@ elif [ "$COVERAGE" ]; then
 
 else
     echo pytest -n 2 -r xX -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas
-    #pytest -m "not single" -v --junitxml=/tmp/multiple.xml $TEST_ARGS pandas # TODO: doctest
-    pytest -m "slow" -v --junitxml=/tmp/multiple.xml $TEST_ARGS pandas # TODO: doctest
+    pytest -n 2 -r xX -m "not single" --junitxml=/tmp/multiple.xml $TEST_ARGS pandas # TODO: doctest
 fi
 
 RET="$?"