From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 5 Jul 2017 16:13:08 +0000 (+0200)
Subject: Update Dockerfile and requirements
X-Git-Tag: 1.7.0~2^2~21^2^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2250a5bcbb569fc08342f24a82d20b7f208284f7;p=telemeta.git

Update Dockerfile and requirements

mysql-client is now in the base docker image
---

diff --git a/Dockerfile b/Dockerfile
index b6e0bd01..46cd53b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,6 @@ RUN mkdir -p /srv/src/
 RUN mkdir -p /srv/app
 RUN mkdir -p /srv/src/telemeta
 
-RUN apt-get install -y --force-yes mysql-client
-
 ENV PYTHON_EGG_CACHE=/srv/.python-eggs
 RUN mkdir -p $PYTHON_EGG_CACHE
 RUN chown www-data:www-data $PYTHON_EGG_CACHE
diff --git a/requirements.txt b/requirements.txt
index 73d8c67a..2c584b27 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,6 @@ setuptools
 wheel
 -e .
 # Tests
-pytest-django==2.9
+pytest-django==3.1.2
 pytest-cov
 factory-boy