goto python3, mezzanine 4.1, django 1.9, use custom (up to date) agenda

diff --git a/Dockerfile b/Dockerfile
index 0e3d9c3e8e1371e5efe98fa0df17d2e55a3e8ee3..d084d1baf03344036195fca32078fbabb06da05c 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM python:2.7
+FROM python:3
 
 ENV PYTHONUNBUFFERED 1
 
 RUN apt-get update && \
-    apt-get -y --force-yes install locales netcat && \
+    apt-get -y --force-yes install locales netcat pandoc && \
     echo fr_FR.UTF-8 UTF-8 >> /etc/locale.gen && \
     locale-gen
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..31300f08a18e8b9af220c097c949573aefc24e4c 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -0,0 +1,4 @@
+-e git+https://github.com/yomguy/mezzanine-agenda.git#egg=mezzanine-agenda-0.2.0
+
+
+

diff --git a/requirements.txt b/requirements.txt
index 6e1afd7575f12d7dbaabb7e5193d79b6c4f3887f..53bb5eba274cad0755a26bb4434ead933fd237b2 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,10 @@
 setuptools
 uwsgi
 watchdog
-MySQL-python==1.2.5
-Django==1.8.9
-mezzanine==4.0.1
+mysqlclient
+Django==1.9.2
+mezzanine==4.1.0
 django-modeltranslation
 django-meta
 psycopg2
-mezzanine-agenda
 django-bower