aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2012-11-07 21:13:38 +0000
committerTom Christie2012-11-07 21:13:38 +0000
commit9fe317b2caee8e397ae669fb0d99c5fb730f7819 (patch)
treefc59e3426996caacb6802a2cfb49c7fd4f340c24
parent30799a3955b3b13ae0d40791f1260f05bda438be (diff)
downloaddjango-rest-framework-9fe317b2caee8e397ae669fb0d99c5fb730f7819.tar.bz2
Make django-filter optional
-rw-r--r--.travis.yml1
-rw-r--r--optionals.txt1
-rw-r--r--requirements.txt1
3 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index fa8693a0..800ba241 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ env:
install:
- pip install $DJANGO
- pip install -r requirements.txt --use-mirrors
+ - pip install -e git+https://github.com/alex/django-filter.git@0e4b3d703b31574922ab86fc78a86164aad0c1d0#egg=django-filter
- export PYTHONPATH=.
script:
diff --git a/optionals.txt b/optionals.txt
index cf0d8da4..320cf216 100644
--- a/optionals.txt
+++ b/optionals.txt
@@ -1,2 +1,3 @@
markdown>=2.1.0
PyYAML>=3.10
+-e git+https://github.com/alex/django-filter.git@0e4b3d703b31574922ab86fc78a86164aad0c1d0#egg=django-filter
diff --git a/requirements.txt b/requirements.txt
index 48ff9d65..730c1d07 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
Django>=1.3
--e git+https://github.com/alex/django-filter.git@0e4b3d703b31574922ab86fc78a86164aad0c1d0#egg=django-filter