From 441ebe9b3c24a7bc935c809e583a056a0ff9ab35 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Fri, 22 Nov 2013 18:35:41 +0100 Subject: Test features depending on line_profiler. --- .travis.yml | 2 +- requirements_dev.txt | 4 ++++ tox.ini | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed22c6b..e82d5f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,5 @@ matrix: env: DJANGO_VERSION=1.4.10 install: - pip install -e . - - pip install Django==$DJANGO_VERSION sqlparse + - pip install Django==$DJANGO_VERSION line_profiler sqlparse script: make test diff --git a/requirements_dev.txt b/requirements_dev.txt index 8d7af92..7912ecf 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -7,6 +7,10 @@ Django sqlparse +# Optional runtime dependencies + +line_profiler + # Testing coverage diff --git a/tox.ini b/tox.ini index 00941f4..c40e711 100644 --- a/tox.ini +++ b/tox.ini @@ -25,24 +25,28 @@ whitelist_externals = make basepython = python2.6 deps = Django>=1.4,<1.5 + line_profiler {[testenv]deps} [testenv:py27-django14] basepython = python2.7 deps = Django>=1.4,<1.5 + line_profiler {[testenv]deps} [testenv:py26-django15] basepython = python2.6 deps = Django>=1.5,<1.6 + line_profiler {[testenv]deps} [testenv:py27-django15] basepython = python2.7 deps = Django>=1.5,<1.6 + line_profiler {[testenv]deps} [testenv:py32-django15] @@ -61,12 +65,14 @@ deps = basepython = python2.6 deps = Django>=1.6,<1.7 + line_profiler {[testenv]deps} [testenv:py27-django16] basepython = python2.7 deps = Django>=1.6,<1.7 + line_profiler {[testenv]deps} [testenv:py32-django16] -- cgit v1.2.3