From 556a672781e84d729d4b2d2e88c345335123087e Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Mon, 18 Jul 2016 21:31:37 +0300
Subject: [PATCH] Speed up build process (#2312)

* We don't need all dependecies to run 'tox -e lint'
* We don't really use pytest-django but it wouldn't hurt
  setting --reuse-db
* coveralls doesn't seem to be working at the moment so
  I removed it
* Delete unused runtests.sh. 'tox -e py27' already does
  the same job.
* Cache all dependencies in Travis CI
---
 .travis.yml           |  6 +++---
 pytest.ini            |  2 ++
 requirements/lint.txt |  7 +++++++
 runtests.sh           | 18 ------------------
 tox.ini               |  9 +--------
 5 files changed, 13 insertions(+), 29 deletions(-)
 create mode 100644 pytest.ini
 create mode 100644 requirements/lint.txt
 delete mode 100755 runtests.sh

diff --git a/.travis.yml b/.travis.yml
index 84c0abfea..c89197169 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,13 @@ env:
  - TOX_ENV=py27
  - TOX_ENV=docs
  - TOX_ENV=lint
+cache:
+  directories:
+    - ~/.cache/pip
 install:
  - pip install tox
- - pip install coveralls
 script:
  - tox -e $TOX_ENV
-after_success:
- - coveralls
 notifications:
   slack:
     rooms:
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 000000000..b54499fff
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --reuse-db
diff --git a/requirements/lint.txt b/requirements/lint.txt
new file mode 100644
index 000000000..25fd138be
--- /dev/null
+++ b/requirements/lint.txt
@@ -0,0 +1,7 @@
+-r pip.txt
+maxcdn
+astroid<1.4
+pylint<1.5
+prospector
+pylint-django<0.7
+pyflakes<1.2.0
diff --git a/runtests.sh b/runtests.sh
deleted file mode 100755
index 92d653291..000000000
--- a/runtests.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-(
-    python_path=`pwd`
-    if [ -n "${PYTHON_PATH}" ]; then
-        python_path="${python_path}:${PYTHONPATH}"
-    fi
-    export PYTHONPATH=$python_path
-    if [ -z "${DJANGO_SETTINGS_MODULE}" ]; then
-        export DJANGO_SETTINGS_MODULE=settings.test
-    fi
-
-    cd readthedocs
-    rm -rf rtd_tests/builds/
-
-    LANG=C \
-    coverage run -m pytest $*
-)
diff --git a/tox.ini b/tox.ini
index ca6207e34..4a58e9929 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,14 +19,7 @@ commands =
     sphinx-build -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html
 
 [testenv:lint]
-deps =
-    {[testenv]deps}
-    maxcdn
-    astroid<1.4
-    pylint<1.5
-    prospector
-    pylint-django<0.7
-    pyflakes<1.2.0
+deps = -r{toxinidir}/requirements/lint.txt
 commands =
     prospector \
     --profile-path={toxinidir} \