aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2013-11-22 18:54:22 +0100
committerAymeric Augustin2013-11-22 18:54:22 +0100
commit2e55200257918ced3908feb0c09c3a002e974955 (patch)
tree8a55bb1b8845521a63cd849ab06a18b32fe6e2c7
parentf4b81540ebfa2e6ce9c7c6b57247d476a3d4e152 (diff)
downloaddjango-debug-toolbar-2e55200257918ced3908feb0c09c3a002e974955.tar.bz2
Patched the wrong file.
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini12
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index e82d5f1..9e41306 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 line_profiler sqlparse
+ - pip install Django==$DJANGO_VERSION line_profiler==1.0b3 sqlparse
script: make test
diff --git a/tox.ini b/tox.ini
index 914b209..c40e711 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,28 +25,28 @@ whitelist_externals = make
basepython = python2.6
deps =
Django>=1.4,<1.5
- line_profiler==1.0b3
+ line_profiler
{[testenv]deps}
[testenv:py27-django14]
basepython = python2.7
deps =
Django>=1.4,<1.5
- line_profiler==1.0b3
+ line_profiler
{[testenv]deps}
[testenv:py26-django15]
basepython = python2.6
deps =
Django>=1.5,<1.6
- line_profiler==1.0b3
+ line_profiler
{[testenv]deps}
[testenv:py27-django15]
basepython = python2.7
deps =
Django>=1.5,<1.6
- line_profiler==1.0b3
+ line_profiler
{[testenv]deps}
[testenv:py32-django15]
@@ -65,14 +65,14 @@ deps =
basepython = python2.6
deps =
Django>=1.6,<1.7
- line_profiler==1.0b3
+ line_profiler
{[testenv]deps}
[testenv:py27-django16]
basepython = python2.7
deps =
Django>=1.6,<1.7
- line_profiler==1.0b3
+ line_profiler
{[testenv]deps}
[testenv:py32-django16]