From 3f538d5b89c48875a251e3d973d1c56a30618b92 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 20 May 2015 01:03:59 +0000 Subject: [PATCH] Switch from MySQL-python to PyMySQL As discussed in the Liberty Design Summit "Moving apps to Python 3" cross-project workshop, the way forward in the near future is to switch to the pure-python PyMySQL library as a default. https://etherpad.openstack.org/p/liberty-cross-project-python3 Change-Id: I1b66bd149aba75e565acd0d23e15a1b489ee710d --- doc/source/draft/admin-guide/prepare_lab.rst | 12 +++--------- doc/source/install/prepare.rst | 6 ------ test-requirements.txt | 2 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/doc/source/draft/admin-guide/prepare_lab.rst b/doc/source/draft/admin-guide/prepare_lab.rst index a57e3b97e..022e31ae6 100644 --- a/doc/source/draft/admin-guide/prepare_lab.rst +++ b/doc/source/draft/admin-guide/prepare_lab.rst @@ -49,21 +49,17 @@ Supported Operation Systems * libffi-dev -* libmysqlclient-dev - * libpq-dev * python-openssl * mysql-client -* python-mysqldb - Install all the requirements on Ubuntu by running:: # apt-get install gcc python-pip python-dev \ - libxml2-dev libxslt-dev libffi-dev libmysqlclient-dev \ - libpq-dev python-openssl mysql-client python-mysqldb + libxml2-dev libxslt-dev libffi-dev \ + libpq-dev python-openssl mysql-client *CentOS* @@ -85,13 +81,11 @@ Install all the requirements on Ubuntu by running:: * mysql -* MySQL-python - Install all the requirements on CentOS by running:: # yum install gcc python-pip python-devel libxml2-devel \ libxslt-devel libffi-devel postgresql-devel pyOpenSSL \ - mysql MySQL-python + mysql .. _lab_requirements: diff --git a/doc/source/install/prepare.rst b/doc/source/install/prepare.rst index 43f95a3c5..af783b72a 100644 --- a/doc/source/install/prepare.rst +++ b/doc/source/install/prepare.rst @@ -44,16 +44,12 @@ System prerequisites * libffi-dev -* libmysqlclient-dev - * libpq-dev * python-openssl * mysql-client -* python-mysqldb - *CentOS* * gcc @@ -74,8 +70,6 @@ System prerequisites * mysql -* MySQL-python - Lab Requirements ================ diff --git a/test-requirements.txt b/test-requirements.txt index a36902b41..282278afb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -20,7 +20,7 @@ unittest2 pylint==1.4.1 # GNU GPL v2 # Some of the tests use real MySQL and Postgres databases -MySQL-python +PyMySQL>=0.6.2 # MIT License psycopg2 # doc build requirements