From f9bc8d455340f64e829fb2efd6490bb348aab225 Mon Sep 17 00:00:00 2001 From: Guillaumme Pellerin Date: Tue, 5 Feb 2019 01:02:21 +0100 Subject: [PATCH] remove and pin various modules --- Dockerfile | 4 ++-- app/settings.py | 8 ++++---- requirements-dev.txt | 4 ++-- requirements.txt | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5a4e9401..3db02d4a 100644 --- 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 6ef81992..ce0bf1ee 100644 --- 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 ac1d96e4..b2354682 100644 --- 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 c497d967..2e52f7ab 100644 --- 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 . -- 2.39.5