From: Guillaume Pellerin Date: Thu, 9 Apr 2020 07:09:26 +0000 (+0200) Subject: [desp] mv to mysql, add dev modules, cleanup deps X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=21df31a8b23f4d3aca56a0e7572bfb07b3f74888;p=teleforma.git [desp] mv to mysql, add dev modules, cleanup deps --- diff --git a/docker-compose.yml b/docker-compose.yml index b6290e4d..a40b38d1 100644 --- 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 ac1d96e4..a8dbf343 100644 --- 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 080308b0..90a350f9 100644 --- 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