diff --git a/.travis.yml b/.travis.yml index c4edc30d8..1bd8c3101 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ env: # running pip install. - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels + - PIP_DOWNLOAD_CACHE=$HOME/.cache/pip matrix: - TOX_ENV=py27-flake8 - TOX_ENV=py27-docs diff --git a/pip_install.sh b/pip_install.sh deleted file mode 100755 index 07826b602..000000000 --- a/pip_install.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -echo "$@" -pip wheel "$@" -pip install --upgrade "$@" diff --git a/tox.ini b/tox.ini index 71bb22eab..5119bbb37 100644 --- a/tox.ini +++ b/tox.ini @@ -6,10 +6,12 @@ envlist = {py27,py32,py33,py34}-django{17,18beta} [testenv] -install_command = ./pip_install.sh {opts} {packages} commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 + PIP_WHEEL_DIR=$HOME/.cache/pip/wheels + PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels + PIP_DOWNLOAD_CACHE=$HOME/.cache/pi deps = django14: Django==1.4.11 # Should track minimum supported django15: Django==1.5.6 # Should track minimum supported