Drop MySQL dependency

I think it's been years since anything in the project used the
mysqlclient package, so let's stop making everyone install it and everything it requires.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/bootstrap b/bootstrap
index d1c3dadcbbaad204c2e38f1a7592359c87c58088..b12eda5b7fc79179f744ebcb047368debbbe3104 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -21,9 +21,9 @@ Linux)
     Ubuntu|Debian|LinuxMint)
         # Ensure setuptools is installed
         if [[ "$PYTHON" =~ "python2" ]]; then
-            deps=(qemu-utils python-dev libssl-dev python-pip python-virtualenv libev-dev libvirt-dev libmysqlclient-dev libffi-dev libyaml-dev)
+            deps=(qemu-utils python-dev libssl-dev python-pip python-virtualenv libev-dev libvirt-dev libffi-dev libyaml-dev)
         else
-            deps=(qemu-utils python3-dev libssl-dev python3-pip python3-virtualenv libev-dev libvirt-dev libmysqlclient-dev libffi-dev libyaml-dev)
+            deps=(qemu-utils python3-dev libssl-dev python3-pip python3-virtualenv libev-dev libvirt-dev libffi-dev libyaml-dev)
         fi
         for package in ${deps[@]}; do
             if [ "$(dpkg --status -- $package|sed -n 's/^Status: //p')" != "install ok installed" ]; then
@@ -64,7 +64,7 @@ Linux)
        fi
        ;;
     Fedora)
-        for package in python2-pip python2-virtualenv libev-devel libvirt-devel community-mysql-devel libffi-devel; do
+        for package in python2-pip python2-virtualenv libev-devel libvirt-devel libffi-devel; do
            if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
                missing="${missing:+$missing }$package"
            fi
@@ -90,9 +90,9 @@ Linux)
     "openSUSE project"|"SUSE LINUX"|"openSUSE")
 
        if [[ "$PYTHON" =~ "python2" ]]; then
-           deps=(python-pip python-devel python-virtualenv libev-devel libvirt-devel libmysqlclient-devel libffi-devel)
+           deps=(python-pip python-devel python-virtualenv libev-devel libvirt-devel libffi-devel)
        else
-           deps=(python3-pip python3-devel python3-virtualenv libev-devel libvirt-devel libmysqlclient-devel libffi-devel)
+           deps=(python3-pip python3-devel python3-virtualenv libev-devel libvirt-devel libffi-devel)
        fi
        for package in ${deps[@]}; do
             if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
@@ -118,7 +118,7 @@ Darwin)
         echo "You need Homebrew: http://brew.sh/"
         exit 1
     fi
-    for keg in python libvirt libev mysql libffi; do
+    for keg in python libvirt libev libffi; do
         if brew list $keg >/dev/null 2>&1; then
             echo "Found $keg"
         else

diff --git a/requirements.in b/requirements.in
index 27b1825b8780d83ecfebcc4c7a8c8ec9534ae853..0a15c753a59e77893f6f9e7a8ca4aa9bbb2dd128 100644 (file)
--- a/requirements.in
+++ b/requirements.in
@@ -1 +1 @@
--e .[coverage,orchestra,test]
+-e .[orchestra,test]

diff --git a/requirements2.txt b/requirements2.txt
index ff91b5746444ed94b2a3560caa91828cfb9b0074..1f241db36807597a4a7d62ea3080e3e0c0e5a192 100644 (file)
--- a/requirements2.txt
+++ b/requirements2.txt
@@ -54,7 +54,6 @@ markupsafe==1.1.1         # via jinja2
 monotonic==1.3            # via humanfriendly, oslo.utils
 more-itertools==4.3.0     # via pytest
 msgpack-python==0.4.8     # via oslo.serialization
-mysqlclient==1.4.2        # via teuthology
 ndg-httpsclient==0.4.2    # via teuthology
 netaddr==0.7.19           # via oslo.config, oslo.utils, python-neutronclient, teuthology
 netifaces==0.10.5         # via oslo.utils

diff --git a/requirements3.txt b/requirements3.txt
index be541af39984745136db3f7eb7b4a9d964237756..d6e0124c892f10df706a5b9cbbd9f92e28aae1d7 100644 (file)
--- a/requirements3.txt
+++ b/requirements3.txt
@@ -49,7 +49,6 @@ markupsafe==1.1.1         # via jinja2
 monotonic==1.3            # via oslo.utils
 more-itertools==4.3.0     # via pytest
 msgpack-python==0.4.8     # via oslo.serialization
-mysqlclient==1.4.2        # via teuthology
 ndg-httpsclient==0.4.2    # via teuthology
 netaddr==0.7.19           # via oslo.config, oslo.utils, python-neutronclient, teuthology
 netifaces==0.10.5         # via oslo.utils

diff --git a/setup.py b/setup.py
index bd7f3f23ca692270149d554baf1c6c7af19eefb2..d51e752a45e2d2c7d3cff17a0ffa7a77aedb50ea 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,6 @@ setup(
                       'humanfriendly',
                       ],
     extras_require = {
-        'coverage': [ 'mysqlclient == 1.4.2'],
         'orchestra': [
             # For apache-libcloud when using python < 2.7.9
             'backports.ssl_match_hostname',