Skip to content

Commit

Permalink
Drop MySQL dependency
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
zmc committed May 28, 2020
1 parent 5ae3303 commit 860ff7a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
12 changes: 6 additions & 6 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-e .[coverage,orchestra,test]
-e .[orchestra,test]
1 change: 0 additions & 1 deletion requirements2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion requirements3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
'humanfriendly',
],
extras_require = {
'coverage': [ 'mysqlclient == 1.4.2'],
'orchestra': [
# For apache-libcloud when using python < 2.7.9
'backports.ssl_match_hostname',
Expand Down

0 comments on commit 860ff7a

Please sign in to comment.