change to pymysql

Closes #190

.gitignore

@@ -20,3 +20,6 @@ tests/testdata/ca/*.txt
 tests/testdata/ca/*.der
 node_modules
 po/*.mo
+contrib/python-pyjwt/
+contrib/python-pymysql/
+htmlcov/

Makefile

@@ -12,7 +12,7 @@ info:
 	@echo "make ppa-dev      - upload to launchpad development repo"
 
 #VERSION=1.3~dev5
-VERSION=2.7~dev0
+VERSION=2.7~dev1
 SERIES="trusty precise vivid"
 LOCAL_SERIES=`lsb_release -a | grep Codename | cut -f2`
 SRCDIRS=deploy authmodules migrations doc tests tools privacyidea 

contrib/Makefile

@@ -14,6 +14,10 @@ CONTRIB4=python-flask-sqlalchemy
 VERSION4=2.0
 URL4=https://pypi.python.org/packages/source/F/Flask-SQLAlchemy/Flask-SQLAlchemy-$(VERSION4).tar.gz
 
+CONTRIB5=python-pymysql
+VERSION5=0.6.6
+URL5=https://pypi.python.org/packages/source/P/PyMySQL/PyMySQL-$(VERSION5).tar.gz
+
 ME=Cornelius Kölbel <cornelius@privacyidea.org>
 
 series=trusty
@@ -77,17 +81,30 @@ flask-sqlalchemy:
 	(cp $(CONTRIB4)/deb_dist/* DEBUILD || true)
 
 
+pymysql:
+	mkdir -p $(CONTRIB5)
+	mkdir -p DEBUILD
+	(cd $(CONTRIB5); curl $(URL5) -o PyMySQL-$(VERSION5).tar.gz) 
+	(cd $(CONTRIB5); py2dsc -m '$(ME)' PyMySQL-$(VERSION5).tar.gz)
+	(cd $(CONTRIB5)/deb_dist/pymysql-$(VERSION5); dch -v $(VERSION5)-1$(series)1 --distribution $(series) -M "built for privacyidea")
+	(cd $(CONTRIB5)/deb_dist/pymysql-$(VERSION5); debuild -sa -S)
+	(cd $(CONTRIB5)/deb_dist/pymysql-$(VERSION5); debuild -b)
+	(cp $(CONTRIB5)/deb_dist/* DEBUILD || true)
+
+
 ppa-dev:
 	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea-dev flask-cache_${VERSION1}-1${series}1_source.changes || true )
 	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea-dev pyjwt_${VERSION2}-1${series}1_source.changes || true)
 	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea-dev ldap3_${VERSION3}-1${series}1_source.changes || true)
 	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea-dev flask-sqlalchemy_${VERSION4}-1${series}1_source.changes || true)
+	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea-dev pymysql_${VERSION5}-1${series}1_source.changes || true)
 
 ppa:
 	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea flask-cache_${VERSION1}-1${series}1_source.changes || true)
 	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea pyjwt_${VERSION2}-1${series}1_source.changes || true)
 	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea ldap3_${VERSION3}-1${series}1_source.changes || true)
 	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea flask-sqlalchemy_${VERSION4}-1${series}1_source.changes || true)
+	(cd DEBUILD; dput -f ppa:privacyidea/privacyidea pymysql_${VERSION5}-1${series}1_source.changes || true)
 
 
 
@@ -96,4 +113,5 @@ clean:
 	rm -fr $(CONTRIB2)
 	rm -fr $(CONTRIB3)
 	rm -fr $(CONTRIB4)
+	rm -fr $(CONTRIB5)
 	rm -fr DEBUILD

deploy/debian-ubuntu/changelog

@@ -1,8 +1,9 @@
-python-privacyidea (2.7~dev0) trusty; urgency=low
+python-privacyidea (2.7~dev1) trusty; urgency=low
 
   * Start 2.7
+  * Change dependency for PyMySQL
 
- -- Cornelius Kölbel <cornelius@privacyidea.org>  Sat, 12 Sep 2015 09:30:00 +0200
+ -- Cornelius Kölbel <cornelius@privacyidea.org>  Mon, 14 Sep 2015 20:30:00 +0200
 
 python-privacyidea (2.6-1trusty) trusty; urgency=low
 

requirements.txt

@@ -26,7 +26,7 @@ Mako==1.0.0
 MarkupSafe==0.23
 matplotlib==1.4.3
 mock==1.0.1
-MySQL-python==1.2.5
+PyMySQL>=0.6.6
 netaddr==0.7.12
 nose==1.3.4
 numpy==1.9.2

setup.py

@@ -5,7 +5,7 @@
 import sys
 
 #VERSION="2.1dev4"
-VERSION="2.7dev0"
+VERSION="2.7dev1"
 
 # Taken from kennethreitz/requests/setup.py
 package_directory = os.path.realpath(os.path.dirname(__file__))
@@ -29,7 +29,7 @@ def get_file_contents(file_path):
                     "Jinja2>=2.7.3",
                     "Mako>=0.9.1",
                     "MarkupSafe>=0.23",
-                    "MySQL-python>=1.2.5",
+                    "PyMySQL>=0.6.6",
                     "Pillow>=2.6.1",
                     "PyJWT>=1.3.0",
                     "PyYAML>=3.11",