From dd807597e9ca5ccca45f99c0a5ca56f84dabd7e9 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 29 Feb 2016 15:32:07 +0100 Subject: [PATCH] goto python3, mezzanine 4.1, django 1.9, use custom (up to date) agenda --- Dockerfile | 4 ++-- requirements-dev.txt | 4 ++++ requirements.txt | 7 +++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e3d9c3e..d084d1ba 100644 --- 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 e69de29b..31300f08 100644 --- 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 6e1afd75..53bb5eba 100644 --- 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 -- 2.39.5