From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 15 Oct 2015 14:01:35 +0000 (+0200)
Subject: pin elasticsearch python module, split requirements
X-Git-Tag: 1.6b~7^2~65
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9bcab190f8112ca725dd362002bcd994b6492a5d;p=telemeta.git

pin elasticsearch python module, split requirements
---

diff --git a/Dockerfile b/Dockerfile
index 62637fd0..138c9d35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,7 @@ WORKDIR /opt/Telemeta
 
 # Install deps
 RUN mkdir /opt/src
-RUN pip install -r requirements.txt --src /opt/src
+RUN pip install -r requirements.txt
+RUN pip install -r requirements-dev.txt --src /opt/src
 
 EXPOSE 8000
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 00000000..fc725761
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,3 @@
+
+-e git+https://github.com/mariocesar/sorl-thumbnail.git@eb52b23348fa5b1446c590f4ac95114dae81c168#egg=sorl-thumbnail-12.2
+-e git+https://github.com/Parisson/ebooklib.git#egg=ebooklib-0.16
diff --git a/requirements.txt b/requirements.txt
index 5134ff4b..d66c1a17 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,3 @@
 
 setuptools
 -e .
--e git+https://github.com/mariocesar/sorl-thumbnail.git@eb52b23348fa5b1446c590f4ac95114dae81c168#egg=sorl-thumbnail-12.2
--e git+https://github.com/Parisson/ebooklib.git#egg=ebooklib-0.16
diff --git a/setup.py b/setup.py
index 7133ce25..90ce7a47 100644
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ setup(
         'python-ebml',
         'zipstream',
         'django-haystack',
-        'elasticsearch<2.0.0',
+        'elasticsearch==1.6.0',
         'ebooklib',
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],