[desp] mv to mysql, add dev modules, cleanup deps

diff --git a/docker-compose.yml b/docker-compose.yml
index b6290e4ded1f92ef109d29eebea0fc667206e82a..a40b38d1a9b9672a8494fa69e772d664d92aa59b 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 data:
-  image: debian:jessie
+  image: debian:buster
   volumes:
      - ./var/media/:/srv/media
      - ./var/static/:/srv/static
@@ -7,7 +7,7 @@ data:
   command: "true"
 
 db:
-  image: mariadb
+  image: mysql:5
   environment:
     - MYSQL_ROOT_PASSWORD=mysecretpassword
     - MYSQL_DATABASE=teleforma

diff --git a/requirements-dev.txt b/requirements-dev.txt
index ac1d96e43707561345e7ea736e335d9732808111..a8dbf343a595669db35f353c0e3b691dba3429c2 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,2 +1,18 @@
+setuptools
+django==1.11
+django-pagination
+django-postman
+django-extensions
+django-notes
+django-timezones
+django-jqchat
+django-registration
+django-extra-views
+django-simple-captcha
+django-suit
+django-nvd3
+django-user-agents
+xhtml2pdf
+html5lib
 -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
+

diff --git a/requirements.txt b/requirements.txt
index 080308b064f123216a678d2aff97c0a2b52978b2..90a350f9de64d4324e3d028d18a779f2d171015c 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,12 @@
 setuptools
-django==1.4.19
+django==1.11
 telemeta==1.4.6
-south
 django-pagination==1.0.7
 django-postman==3.2.0
 django-extensions==0.9
 django-notes
 django-timezones==0.2
 django-jqchat
-crocodoc
 django-registration==0.8
 django-extra-views==0.6.5
 django-simple-captcha