update mysql deps

diff --git a/Dockerfile b/Dockerfile
index f75a769d366441a3d581b8946f1c966f2bd1bd3a..5d5b91c15dedfabb89c9ab78fdb0c66cb8ce1352 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-key adv --keyserver pgp.mit.edu --recv-key E3298399DF14BB7C && \
     echo 'deb http://debian.parisson.com/debian/ wheezy main' > /etc/apt/sources.list.d/parisson.list && \
     apt-get update && \
     apt-get -y --force-yes -t wheezy-backports dist-upgrade  && \
-    apt-get install -y --force-yes python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-gnonlin gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-alsa vamp-examples libmysqlclient-dev && \
+    apt-get install -y --force-yes python-gst0.10 gstreamer0.10-plugins-good gstreamer0.10-gnonlin gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-alsa vamp-examples && \
     apt-get install -y --force-yes -t wheezy-backports python-yaafe && \
     apt-get install -y --force-yes wget bzip2 build-essential && \
     apt-get clean

diff --git a/conda-requirements.txt b/conda-requirements.txt
index b2f33a393b205ba11cd49916c9986c8759f44405..2322391bb510aac926cc5ac3a8c8a4c3bb9803de 100644 (file)
--- a/conda-requirements.txt
+++ b/conda-requirements.txt
@@ -13,4 +13,4 @@ requests=2.5.1=py27_0
 scipy=0.14.0=np19py27_0
 setuptools=12.2=py27_0
 traits=4.4.0=py27_0
-mysql-python=1.2.5=py27_0
\ No newline at end of file
+mysql-python=1.2.3=py27_0
\ No newline at end of file

diff --git a/setup.py b/setup.py
index d78177447807ece62526807a8584f44582c1f620..4847c79fc0112e6d75b67a4f253b2b4fb7ddc0ac 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,6 @@ setup(
         'networkx',
         'django-celery',
         'watchdog',
-        'mysql',
         ],
     platforms=['OS Independent'],
     license='Gnu Public License V2',