From e050e2e6a3e0ee6af0e85d0b6c9803ed720aba18 Mon Sep 17 00:00:00 2001 From: Michel Sabchuk Date: Tue, 23 May 2017 14:05:59 -0300 Subject: [PATCH] Rely on tox to run tests and test supported django versions. Use tox instead travis directly to let someone to run tests in the same way travis would do. --- .travis.yml | 8 ++------ requirements.txt | 1 - tox.ini | 8 ++++++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee440a3ac..6c4b8bbd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,6 @@ language: python python: - "2.7" -# command to install dependencies install: - - pip install -r requirements.txt - # Deal with issue on Travis builders re: multiprocessing.Queue :( - - "sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm" -# command to run tests -script: make unit functional + - pip install tox +script: tox diff --git a/requirements.txt b/requirements.txt index d483b4e9d..77c3fe1cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -Django==1.9.4 Jinja2==2.8 Pygments==1.5 Sphinx==1.1.3 diff --git a/tox.ini b/tox.ini index a2b18287d..b35ca5bc1 100644 --- a/tox.ini +++ b/tox.ini @@ -4,10 +4,14 @@ # and then run "tox" from this directory. [tox] -envlist = py27 +envlist = py27-django{18,110,111} [testenv] +deps = + -r{toxinidir}/requirements.txt + django18: Django>=1.8,<1.9 + django110: Django>=1.10,<1.11 + django111: Django>=1.11,<2 commands = - pip install -q -r requirements.txt make unit functional whitelist_externals = make