From: Zack Cerza <zack@redhat.com>
Date: Thu, 14 May 2020 19:39:51 +0000 (-0600)
Subject: drop mysql dep
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dec3ec7981a8fe7d311588f831fed36d12c8b07e;p=teuthology.git

drop mysql dep
---

diff --git a/bootstrap b/bootstrap
index 935ea4f5e..206913b9c 100755
--- 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 python-pip python3-virtualenv libev-dev libvirt-dev libmysqlclient-dev libffi-dev libyaml-dev)
+            deps=(qemu-utils python3-dev libssl-dev python-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
@@ -88,7 +88,7 @@ Linux)
 	fi
 	;;
     "openSUSE project"|"SUSE LINUX"|"openSUSE")
-        for package in python-pip python-devel python-virtualenv libev-devel libvirt-devel libmysqlclient-devel libffi-devel; do
+        for package in python-pip python-devel python-virtualenv libev-devel libvirt-devel libffi-devel; do
             if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
                 if [ "$(rpm -q --whatprovides $package)" == "no package provides $package" ]; then
                     missing="${missing:+$missing }$package"
@@ -112,7 +112,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 27b1825b8..0a15c753a 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1 +1 @@
--e .[coverage,orchestra,test]
+-e .[orchestra,test]
diff --git a/requirements2.txt b/requirements2.txt
index fd99a584c..18672f33b 100644
--- 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 102c69ff7..369980311 100644
--- 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 4d562b3fc..6f902f8de 100644
--- 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',