pin elasticsearch python module, split requirements

diff --git a/Dockerfile b/Dockerfile
index 62637fd0876f04d17d01994ddea81a562317e6de..138c9d358ba61fc5aa327c9f58c47f29350d8302 100644 (file)
--- 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 (file)
index 0000000..fc72576
--- /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 5134ff4b9d4dc18f2dc4af38ce2f862034629a9c..d66c1a175ab244a98c32ffd58d2cbc3abd85a831 100644 (file)
--- 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 7133ce25413d8b1054f77ace7db58164d0c02d5a..90ce7a47e00040697cab863c388c476cf854add9 100644 (file)
--- 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'],