BLD: Accommodate changes in latest travis-ci image update

Author: y-p

.travis.yml

@@ -3,7 +3,7 @@ language: python
 python:
   - 2.6
   - 2.7
-  - 3.1 # travis will soon EOL this
+#  - 3.1 # travis EOL
   - 3.2
   - 3.3
 
@@ -45,8 +45,10 @@ before_install:
 install:
   - echo "Waldo2"
   - ci/install.sh
-  - ci/print_versions.py # not including stats
 
 script:
   - echo "Waldo3"
   - ci/script.sh
+
+after_script:
+  - ci/print_versions.py

ci/before_install.sh

@@ -9,20 +9,20 @@ fi
 
 sudo apt-get update $APT_ARGS # run apt-get update for all versions
 
-# hack for broken 3.3 env
-if [ x"$VIRTUAL_ENV" == x"" ]; then
-    VIRTUAL_ENV=~/virtualenv/python$TRAVIS_PYTHON_VERSION_with_system_site_packages;
-fi
+# # hack for broken 3.3 env
+# if [ x"$VIRTUAL_ENV" == x"" ]; then
+#     VIRTUAL_ENV=~/virtualenv/python$TRAVIS_PYTHON_VERSION_with_system_site_packages;
+# fi
 
-# we only recreate the virtualenv for 3.x
-# since the "Detach bug" only affects python3
-# and travis has numpy preinstalled on 2.x which is quicker
-_VENV=$VIRTUAL_ENV # save it
-if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ] ; then
-    deactivate # pop out of any venv
-    sudo pip install virtualenv==1.8.4 --upgrade
-    sudo apt-get install $APT_ARGS python3.3 python3.3-dev
-    sudo rm -Rf $_VENV
-    virtualenv -p python$TRAVIS_PYTHON_VERSION $_VENV --system-site-packages;
-    source $_VENV/bin/activate
-fi
+# # we only recreate the virtualenv for 3.x
+# # since the "Detach bug" only affects python3
+# # and travis has numpy preinstalled on 2.x which is quicker
+# _VENV=$VIRTUAL_ENV # save it
+# if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ] ; then
+#     deactivate # pop out of any venv
+#     sudo pip install virtualenv==1.8.4 --upgrade
+#     sudo apt-get install $APT_ARGS python3.3 python3.3-dev
+#     sudo rm -Rf $_VENV
+#     virtualenv -p python$TRAVIS_PYTHON_VERSION $_VENV --system-site-packages;
+#     source $_VENV/bin/activate
+# fi

ci/install.sh

@@ -21,7 +21,7 @@ fi
 if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ] || \
    [ ${TRAVIS_PYTHON_VERSION}     == "3.1" ] || \
    [ ${TRAVIS_PYTHON_VERSION}     == "3.2" ]; then
-     pip $PIP_ARGS install numpy; #https://github.com/y-p/numpy/archive/1.6.2_with_travis_fix.tar.gz;
+     pip $PIP_ARGS install numpy;
 else
     pip $PIP_ARGS install https://github.com/numpy/numpy/archive/v1.7.0b2.tar.gz;
 fi