BLD: more travis.yml cleanup

Author: y-p

.travis.yml

@@ -11,7 +11,7 @@ env:
 matrix:
   include:
     - python: 2.7
-      env: LOCALE_OVERRIDE="zh_CN.GB18030"  # simplified chinese
+      env: TEST_SLOW=true LOCALE_OVERRIDE="zh_CN.GB18030"  # simplified chinese
     - python: 2.7
       env: FULL_DEPS=true
     - python: 3.2

ci/install.sh

@@ -18,7 +18,7 @@ pip install $PIP_ARGS --use-mirrors cython nose python-dateutil pytz
 
 if [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
     sudo apt-get $APT_ARGS install python3-numpy;
-elif [ ${TRAVIS_PYTHON_VERSION} == "3.3" ] || [  x"$LOCALE_OVERRIDE" != x""  ]; then # should be >=3,3
+elif [ ${TRAVIS_PYTHON_VERSION} == "3.3" ]; then # should be >=3,3
     pip $PIP_ARGS install numpy==1.7.0;
 else
     pip $PIP_ARGS install numpy==1.6.1;

ci/script.sh

@@ -7,17 +7,17 @@ if [ x"$LOCALE_OVERRIDE" != x"" ]; then
     echo "Setting LC_ALL to $LOCALE_OVERRIDE"
     (cd /; python -c 'import pandas; print("pandas detected console encoding: %s" % pandas.get_option("display.encoding"))')
 
-    # also do slow tests here, especially plotting
-    nosetests --exe -w /tmp -A "not network" pandas;
-    exit
 fi
 
-if [ x"$VBENCH" != x"true" ]; then
+if   $TEST_SLOW ; then
+    nosetests --exe -w /tmp -A "not network" pandas;
+    exit
+else
     nosetests --exe -w /tmp -A "not slow" pandas;
     exit
 fi
 
-if [ x"$VBENCH" == x"true" ]; then
-    python vb_suite/perf_HEAD.py;
-    exit
-fi
+# if [ x"$VBENCH" == x"true" ]; then
+#     python vb_suite/perf_HEAD.py;
+#     exit
+# fi