remove and pin various modules

diff --git a/Dockerfile b/Dockerfile
index 5a4e94011a42e72b2db609d62e359ac43a396c19..3db02d4ade9e0f9d02399edbe1f4dfb8396c14b0 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,8 +46,8 @@ COPY . /srv/lib/teleforma
 WORKDIR /srv/lib/teleforma
 RUN pip install -r requirements.txt
 
-#COPY requirements-dev.txt /srv
-#RUN pip install -r requirements-dev.txt --src /srv/lib
+COPY requirements-dev.txt /srv
+RUN pip install -r requirements-dev.txt --src /srv/lib
 
 WORKDIR /srv/app
 

diff --git a/app/settings.py b/app/settings.py
index 6ef819925e6b53b235ac6cbc9cef7cf6971d74a8..ce0bf1eebecd4a0d771683d305d16c0ed34a8bbd 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -132,20 +132,20 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'telemeta',
     'jsonrpc',
-    'south',
+    #'south',
     'teleforma',
     'sorl.thumbnail',
     'django_extensions',
     'pagination',
     'postman',
 #    'private_files',
-    'markup_mixin',
+    #'markup_mixin',
     'notes',
 #    'jquery',
     'timezones',
     'jqchat',
 #    'follow',
-     'googletools',
+    # 'googletools',
      'telecaster',
 )
 
@@ -199,4 +199,4 @@ TELEFORMA_GLOBAL_TWEETER = False
 TELEFORMA_PERIOD_TWEETER = True
 
 JQCHAT_DISPLAY_COUNT = 50
-JQCHAT_DISPLAY_TIME  = 48
\ No newline at end of file
+JQCHAT_DISPLAY_TIME  = 48

diff --git a/requirements-dev.txt b/requirements-dev.txt
index ac1d96e43707561345e7ea736e335d9732808111..b235468262acf3fc65e34191393d730afdc5f160 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,2 +1,2 @@
--e git+https://github.com/Parisson/django_quiz.git#egg=django_quiz-0.5.1
--e git+https://github.com/Parisson/TeleForma.git@tc202#egg=teleforma
+-e git+https://github.com/Parisson/django_quiz.git#egg=django_quiz-0.6.0
+-e git+https://github.com/Parisson/telecaster-client.git#egg=telecaster_client-0.8

diff --git a/requirements.txt b/requirements.txt
index c497d967ad097afddc105e80512ca7e78c5dbd3d..2e52f7ab0f5077ed02a7e59356289d59b4bd969a 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ django-notes
 django-timezones==0.2
 django-jqchat
 django-registration==0.8
-django-extra-views==0.10.0
+django-extra-views==0.11.0
 django-simple-captcha
 django-suit
 django-nvd3
@@ -18,3 +18,4 @@ xhtml2pdf==0.2.3
 markdown<2.5
 django-tinymce==1.5.4
 deefuzzer
+-e .