Merge f8fd7de9d1 into c9618cc0f3

.travis.yml

@@ -2,7 +2,14 @@ language: python
 
 sudo: false
 
+cache:
+  directories:
+  - $HOME/.pip-cache
+
 env:
+    global:
+        - PIP_DOWNLOAD_CACHE=$HOME/.pip-cache
+    matrix:
         - TOX_ENV=py27-flake8
         - TOX_ENV=py27-docs
         - TOX_ENV=py34-django17
@@ -27,7 +34,7 @@ env:
         - TOX_ENV=py27-django18beta
 
 install:
-  - pip install tox
+  - pip install --download-cache $PIP_DOWNLOAD_CACHE tox
 
 script:
     - tox -e $TOX_ENV

tox.ini

@@ -6,6 +6,7 @@ envlist =
        {py27,py32,py33,py34}-django{17,18beta}
 
 [testenv]
+downloadcache={env:PIP_DOWNLOAD_CACHE}
 commands = ./runtests.py --fast
 setenv =
        PYTHONDONTWRITEBYTECODE=1
@@ -19,12 +20,14 @@ deps =
        -rrequirements/requirements-optionals.txt
 
 [testenv:py27-flake8]
+downloadcache={env:PIP_DOWNLOAD_CACHE}
 deps =
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-codestyle.txt
 commands = ./runtests.py --lintonly
 
 [testenv:py27-docs]
+downloadcache={env:PIP_DOWNLOAD_CACHE}
 deps =
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-documentation.txt