From 659d1459735eb99a978641fe3711382672c30423 Mon Sep 17 00:00:00 2001 From: benjaoming Date: Wed, 9 Jan 2013 19:12:29 +0100 Subject: [PATCH] fix double requirement --- .travis.yml | 4 +--- .travis/requirements.txt | 6 ++++++ .travis/requirements_1.4.txt | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .travis/requirements.txt create mode 100644 .travis/requirements_1.4.txt diff --git a/.travis.yml b/.travis.yml index e63b51bb..8dc05a7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,5 @@ python: - "2.7" # command to run tests # script: nosetests -env: - - DJANGO_VERSION=1.4.2 install: - - pip install -r requirements.txt -q Django==$DJANGO_VERSION + - pip install -r .travis/requirements_1.4.txt diff --git a/.travis/requirements.txt b/.travis/requirements.txt new file mode 100644 index 00000000..4e88c3d4 --- /dev/null +++ b/.travis/requirements.txt @@ -0,0 +1,6 @@ +South +Markdown<2.3.0 +django-sekizai<0.7 +django-mptt>=0.5.3 +sorl-thumbnail + diff --git a/.travis/requirements_1.4.txt b/.travis/requirements_1.4.txt new file mode 100644 index 00000000..f65483df --- /dev/null +++ b/.travis/requirements_1.4.txt @@ -0,0 +1,2 @@ +-r requirements.txt +Django>=1.4,<1.5 -- 2.45.2