PTF no more

.travis.yml

@@ -5,14 +5,6 @@ python:
 
 env:
   global:
-    - secure: "O04RU5QRKEDL/SrIWEsVe8O+1TxZqZQSa28Sd+Fz48NW/XddhefYyxzqcUXh\nk/NjWMqknJRQhApLolBianVpsE577OTllzlcyKn3nUL6hjOXcoszGaYray7S\niNGKGyO8xrtB/ZQDtmupz0ksK8sLoCTscdiGotFulczbx0zt+4g="
-    - secure: "PUJ9nC1/v2vpFUtELSoSjI53OHCVXfFTb8+t5lIGIqHtjUBkhiJSNPfCv8Bx\ndsdrx30qP8KsSceYzaa/bog6p8YNU1iih23S0KbjucutvA0LNHBTNvnxmjBR\nSJfKd5FmwnXvizRyghYBzmQ3NmGO7ADw2DBwKOhgGMqCHZ8Tlc8="
-    - secure: "IDcMrCCW+6pgJtsI3Q163OPc0iec1ogpitaqiRhHcrEBUCXZgVeclOeiZBlw\n/u+uGyW/O0NhHMaFXKB8BdDVwlQEEHv48syN6npS/A5+O6jriWKL4ozttOhE\npOlu+yLhHnEwx6wZVIHRTVn+t1GkOrjlBcjaQi+Z13G3XmDaSG8="
-    - secure: "Zu9aj0dTGpvMqT/HqBGQgDYl/v5ubC7lFwfE8Fqb0N1UVXqbpjXnNH/7oal1\nUsIT7klO++LWm+LxsP/A1FWENTSgdYe99JQtNyauW+0x5YR1JTuDJ8atDgx9\nSq66CaVpS5t+ov7UVm2bKSUX+1S8+8zGbIDADrMxEzYEMF7WoGM="
-    - secure: "AfIvLxvCxj22zrqg3ejGf/VePKT2AyGT9erYzlKpBS0H8yi5Pp1MfmJjhaR4\n51zBtzqHPHiIEY6ZdE06o9PioMWkXS+BqJNrxGSbt1ltxgOFrxW5zOpwiFGZ\nZOv1YeFkuPf8PEsWT7615mdydqTQT7B0pqUKK/d6aka4TQ/tg5Q="
-    - secure: "EM4ySBUusReNu7H1QHXvjnP/J1QowvfpwEBmjysYxJuq7KcG8HhhlfpUF+Gh\nLBzLak9QBA67k4edhum3qtKuJR5cHuja3+zuV8xmx096B/m96liJFTrwZpea\n58op3W6ZULctEpQNgIkyae20bjxl4f99JhZRUlonoPfx/rBIMFc="
-    - secure: "pgMYS/6MQqDGb58qdzTJesvAMmcJWTUEEM8gf9rVbfqfxceOL4Xpx8siR9B2\nC4U4MW1cHMPP3RFEb4Jy0uK49aHH10snwZY1S84YPPllpH5ZFXVdN68OayNj\nh4k5N/2hhaaQuJ6Uh8v8s783ye4oYTOW5RJUFqQu4QdG4IkTIMs="
-
     - NOSE_ARGS="not slow" UPLOAD=true
 
 matrix:
@@ -41,7 +33,6 @@ before_install:
   # - export APT_ARGS=-qq # comment this to debug travis install issues
   # - set -x # enable this to see bash commands
   - export ZIP_FLAGS=-q # comment this to debug travis install issues
-  - source ci/envars.sh # we need to source this to bring in the envars
   - ci/before_install.sh
   - python -V
 

ci/before_install.sh

@@ -10,27 +10,4 @@ echo "inside $0"
 # overview
 sudo apt-get update $APT_ARGS # run apt-get update for all versions
 
-if  $PLEASE_TRAVIS_FASTER ; then
-    echo "Faster? well... I'll try."
-
-    if $CACHE_FILE_AVAILABLE ;  then
-        echo retrieving "$CACHE_FILE_URL";
-
-        wget -q "$CACHE_FILE_URL" -O "/tmp/_$CYTHON_HASH.zip";
-        unzip $ZIP_FLAGS /tmp/_"$CYTHON_HASH.zip" -d "$BUILD_CACHE_DIR";
-        rm -f /tmp/_"$CYTHON_HASH.zip"
-        # copy cythonized c files over
-        cp -R "$BUILD_CACHE_DIR"/pandas/*.c pandas/
-        cp -R "$BUILD_CACHE_DIR"/pandas/src/*.c pandas/src/
-    fi;
-    echo "VENV_FILE_AVAILABLE=$VENV_FILE_AVAILABLE"
-    if $VENV_FILE_AVAILABLE ; then
-        echo "getting venv"
-        wget -q $VENV_FILE_URL -O  "/tmp/venv.zip";
-        sudo unzip $ZIP_FLAGS -o /tmp/venv.zip -d "/";
-        sudo chown travis -R "$VIRTUAL_ENV"
-        rm -f /tmp/_"$CYTHON_HASH.zip"
-    fi;
-fi
-
 true # never fail because bad things happened here

ci/install.sh

@@ -45,102 +45,60 @@ if [ x"$FULL_DEPS" == x"true" ] ; then
    fi
 fi
 
-# Everything installed inside this clause into site-packages
-# will get included in the cached venv downloaded from the net
-# in PTF mode
-if ( ! $VENV_FILE_AVAILABLE ); then
-    echo "Running full monty"
-    # Hard Deps
-    pip install $PIP_ARGS  nose python-dateutil pytz
+# Hard Deps
+pip install $PIP_ARGS nose python-dateutil pytz
+pip install $PIP_ARGS cython
+
+if [ ${TRAVIS_PYTHON_VERSION} == "3.3" ]; then # should be >=3,3
+    pip install $PIP_ARGS numpy==1.7.0
+elif [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
+    # sudo apt-get $APT_ARGS install python3-numpy; # 1.6.2 or precise
+    pip install $PIP_ARGS numpy==1.6.1
+else
+    pip install $PIP_ARGS numpy==1.6.1
+fi
+
+# Optional Deps
+if [ x"$FULL_DEPS" == x"true" ]; then
+    echo "Installing FULL_DEPS"
     pip install $PIP_ARGS  cython
 
-    if [ ${TRAVIS_PYTHON_VERSION} == "3.3" ]; then # should be >=3,3
-        pip install $PIP_ARGS numpy==1.7.0
-    elif [ ${TRAVIS_PYTHON_VERSION} == "3.2" ]; then
-        # sudo apt-get $APT_ARGS install python3-numpy; # 1.6.2 or precise
-        pip install $PIP_ARGS numpy==1.6.1
+    if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
+        pip install $PIP_ARGS xlwt
+        pip install $PIP_ARGS bottleneck
+        pip install $PIP_ARGS numexpr==2.0.1
+        pip install $PIP_ARGS tables==2.3.1
     else
-        pip install $PIP_ARGS numpy==1.6.1
+        pip install $PIP_ARGS numexpr
+        pip install $PIP_ARGS tables
     fi
 
-    # Optional Deps
-    if [ x"$FULL_DEPS" == x"true" ]; then
-        echo "Installing FULL_DEPS"
-        pip install $PIP_ARGS  cython
-
-        if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
-            pip install $PIP_ARGS xlwt
-            pip install $PIP_ARGS bottleneck
-            pip install $PIP_ARGS numexpr==2.0.1
-            pip install $PIP_ARGS tables==2.3.1
-        else
-            pip install $PIP_ARGS numexpr
-            pip install $PIP_ARGS tables
-        fi
-
-        pip install $PIP_ARGS matplotlib
-        pip install $PIP_ARGS openpyxl
-        pip install $PIP_ARGS xlrd>=0.9.0
-        pip install $PIP_ARGS 'http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r='
-        pip install $PIP_ARGS patsy
-        pip install $PIP_ARGS html5lib
-
-        if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]; then
-          sudo apt-get $APT_ARGS remove python3-lxml
-        elif [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
-          sudo apt-get $APT_ARGS remove python-lxml
-        fi
-
-        pip install $PIP_ARGS lxml
-        # fool statsmodels into thinking pandas was already installed
-        # so it won't refuse to install itself. We want it in the zipped venv
-
-        mkdir  $SITE_PKG_DIR/pandas
-        touch $SITE_PKG_DIR/pandas/__init__.py
-        echo "version='0.10.0-phony'" >  $SITE_PKG_DIR/pandas/version.py
-        pip install $PIP_ARGS git+git://github.com/statsmodels/statsmodels@c9062e43b8a5f7385537ca95#egg=statsmodels
-
-        rm -Rf $SITE_PKG_DIR/pandas # scrub phoney pandas
+    pip install $PIP_ARGS matplotlib
+    pip install $PIP_ARGS openpyxl
+    pip install $PIP_ARGS xlrd>=0.9.0
+    pip install $PIP_ARGS 'http://downloads.sourceforge.net/project/pytseries/scikits.timeseries/0.91.3/scikits.timeseries-0.91.3.tar.gz?r='
+    pip install $PIP_ARGS patsy
+    pip install $PIP_ARGS html5lib
+
+    if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]; then
+      sudo apt-get $APT_ARGS remove python3-lxml
+    elif [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then
+      sudo apt-get $APT_ARGS remove python-lxml
     fi
 
-    # pack up the venv and cache it
-    if [ x"$STORE_KEY" != x"" ] && $UPLOAD && $PLEASE_TRAVIS_FASTER ; then
-        VENV_FNAME="venv-$TRAVIS_PYTHON_VERSION.zip"
-
-        zip $ZIP_FLAGS -r "$HOME/$VENV_FNAME" $SITE_PKG_DIR/
-        ls -l "$HOME/$VENV_FNAME"
-        echo "posting venv"
-        # silent, don't expose key
-        curl -s --form upload=@"$HOME/$VENV_FNAME" "$CACHE_FILE_STORE_URL/$VENV_FNAME"
-    fi
+    pip install $PIP_ARGS lxml
+    # fool statsmodels into thinking pandas was already installed
+    # so it won't refuse to install itself.
 
-fi;
+    mkdir  $SITE_PKG_DIR/pandas
+    touch $SITE_PKG_DIR/pandas/__init__.py
+    echo "version='0.10.0-phony'" >  $SITE_PKG_DIR/pandas/version.py
+    pip install $PIP_ARGS git+git://github.com/statsmodels/statsmodels@c9062e43b8a5f7385537ca95#egg=statsmodels
 
-#build and install pandas
-if [ x"$BUILD_CACHE_DIR" != x"" ]; then
-    scripts/use_build_cache.py -d
-    python setup.py install;
-else
-   python setup.py build_ext install
+    rm -Rf $SITE_PKG_DIR/pandas # scrub phoney pandas
 fi
 
-# package pandas build artifacts and send them home
-# that's everything the build cache (scripts/use_build_cache.py)
-# stored during the build (.so, pyx->.c and 2to3)
-if  (! $CACHE_FILE_AVAILABLE) ; then
- if [ x"$STORE_KEY" != x"" ] && $UPLOAD && $PLEASE_TRAVIS_FASTER ; then
-     echo "Posting artifacts"
-     strip  "$BUILD_CACHE_DIR/*" &> /dev/null
-     echo  "$BUILD_CACHE_DIR"
-     cd "$BUILD_CACHE_DIR"/
-     zip -r $ZIP_FLAGS "$HOME/$CYTHON_HASH".zip *
-     cd "$TRAVIS_BUILD_DIR"
-     pwd
-     zip "$HOME/$CYTHON_HASH".zip $(find pandas | grep -P '\.(pyx|pxd)$' | sed -r 's/.(pyx|pxd)$/.c/')
-
-     # silent, don't expose key
-     curl   --connect-timeout 5 -s --form upload=@"$HOME/$CYTHON_HASH".zip "$CACHE_FILE_STORE_URL/$CYTHON_HASH.zip"
- fi
-fi
+# build pandas
+python setup.py build_ext install
 
 true