Merge branch 'master' into federate

.travis.yml

@@ -14,12 +14,12 @@ env:
     - TOX_ENV=py34-django19
 cache:
   directories:
-    - $HOME/.cache/pip/
-    - $HOME/build/nitmir/django-cas-server/.tox/
+    - $HOME/.cache/pip/http/
+    - $HOME/build/nitmir/django-cas-server/.tox/$TOX_ENV/
 install:
   - "travis_retry pip install setuptools --upgrade"
   - "pip install tox"
 script:
   - tox -e $TOX_ENV
 after_script:
-  - cat .tox/$TOX_ENV/log/*.log
+  - cat tox_log/*.log

Makefile

@@ -17,7 +17,7 @@ clean_pyc:
 clean_build:
 	rm -rf build django_cas_server.egg-info dist
 clean_tox:
-	rm -rf .tox
+	rm -rf .tox tox_logs
 clean_test_venv:
 	rm -rf test_venv
 clean_coverage:

tox.ini

@@ -17,8 +17,21 @@ exclude=migrations
 deps =
     -r{toxinidir}/requirements-dev.txt
 
+[post_cmd]
+commands=
+    find {toxworkdir} -name '*.pyc' -delete
+    mkdir -p {toxinidir}/tox_logs/
+    bash -c "mv  {toxworkdir}/{envname}/log/* {toxinidir}/tox_logs/"
+whitelist_externals=
+    find
+    bash
+    mkdir
+
 [testenv]
-commands=py.test {posargs:cas_server/tests/}
+commands=
+    py.test {posargs:cas_server/tests/}
+    {[post_cmd]commands}
+whitelist_externals={[post_cmd]whitelist_externals}
 
 [testenv:py27-django17]
 basepython=python2.7
@@ -59,14 +72,22 @@ deps =
 [testenv:flake8]
 basepython=python
 deps=flake8
-commands=flake8 {toxinidir}/cas_server
+skip_install=True
+commands=
+    flake8 {toxinidir}/cas_server
+    {[post_cmd]commands}
+whitelist_externals={[post_cmd]whitelist_externals}
 
 [testenv:check_rst]
 basepython=python
 deps=
     docutils
     Pygments
-commands=rst2html.py --strict {toxinidir}/README.rst /dev/null
+skip_install=True
+commands=
+    rst2html.py --strict {toxinidir}/README.rst /dev/null
+    {[post_cmd]commands}
+whitelist_externals={[post_cmd]whitelist_externals}
 
 [testenv:coverage]
 basepython=python
@@ -74,7 +95,9 @@ passenv=CODACY_PROJECT_TOKEN
 deps=
     -r{toxinidir}/requirements-dev.txt
     codacy-coverage
+skip_install=True
 commands=
     py.test --cov=cas_server --cov-report xml
     python-codacy-coverage -r {toxinidir}/coverage.xml
-
+    {[post_cmd]commands}
+whitelist_externals={[post_cmd]whitelist_externals}