Fixed bugs in handling of Python 3 dependencies on install. (#9839)
* Remove duplicate python3-pymongo line. * Add proper exceptions for Python 3 packages for RHEL/CentOS.
Austin S. Hemmelgarn committed
Sep 1, 2020 at 07:04 UTC
d8e96eba6b241905e7ec84e75223a290acc67149
1 file changed
+21
-3
packaging/installer/install-required-packages.sh
+21
-3
@@ -954,6 +954,10 @@ declare -A pkg_python3_mysqldb=(
954
['ubuntu-14.10']="WARNING|"
955
['ubuntu-15.04']="WARNING|"
956
['ubuntu-15.10']="WARNING|"
957
+ ['centos-7']="python36-mysql"
958
+ ['centos-8']="python38-mysql"
959
+ ['rhel-7']="python36-mysql"
960
+ ['rhel-8']="python38-mysql"
961
)
962
963
declare -A pkg_python_psycopg2=(
@@ -982,6 +986,11 @@ declare -A pkg_python3_psycopg2=(
986
['clearlinux']="WARNING|"
987
['macos']="WARNING|"
988
['default']="WARNING|"
989
+
990
+ ['centos-7']="python3-psycopg2"
991
+ ['centos-8']="python38-psycopg2"
992
+ ['rhel-7']="python3-psycopg2"
993
+ ['rhel-8']="python38-psycopg2"
994
)
995
996
declare -A pkg_python_pip=(
@@ -996,10 +1005,8 @@ declare -A pkg_python_pip=(
1005
declare -A pkg_python3_pip=(
1006
['alpine']="py3-pip"
1007
['arch']="python-pip"
999
- ['centos']="WARNING|"
1008
['gentoo']="dev-python/pip"
1009
['sabayon']="dev-python/pip"
1002
- ['rhel']="WARNING|"
1010
['clearlinux']="python3-basic"
1011
['macos']="NOTREQUIRED"
1012
['default']="python3-pip"
@@ -1013,6 +1020,7 @@ declare -A pkg_python_pymongo=(
1020
['gentoo']="dev-python/pymongo"
1021
['suse']="python-pymongo"
1022
['clearlinux']="WARNING|"
1023
+ ['rhel']="WARNING|"
1024
['macos']="WARNING|"
1025
['default']="python-pymongo"
1026
)
@@ -1025,9 +1033,15 @@ declare -A pkg_python3_pymongo=(
1033
['gentoo']="dev-python/pymongo"
1034
['suse']="python3-pymongo"
1035
['clearlinux']="WARNING|"
1036
+ ['rhel']="WARNING|"
1037
['freebsd']="py37-pymongo"
1038
['macos']="WARNING|"
1039
['default']="python3-pymongo"
1040
+
1041
+ ['centos-7']="python36-pymongo"
1042
+ ['centos-8']="python3-pymongo"
1043
+ ['rhel-7']="python36-pymongo"
1044
+ ['rhel-8']="python3-pymongo"
1045
)
1046
1047
declare -A pkg_python_requests=(
@@ -1058,6 +1072,11 @@ declare -A pkg_python3_requests=(
1072
['clearlinux']="python-extras"
1073
['macos']="WARNING|"
1074
['default']="WARNING|"
1075
+
1076
+ ['centos-7']="python36-requests"
1077
+ ['centos-8']="python3-requests"
1078
+ ['rhel-7']="python36-requests"
1079
+ ['rhel-8']="python3-requests"
1080
)
1081
1082
declare -A pkg_lz4=(
@@ -1379,7 +1398,6 @@ packages() {
1398
if [ "${PACKAGES_NETDATA_PYTHON3}" -ne 0 ]; then
1399
require_cmd python3 || suitable_package python3
1400
1382
- suitable_package python3-pymongo
1401
[ "${PACKAGES_NETDATA_PYTHON_MONGO}" -ne 0 ] && suitable_package python3-pymongo
1402
# suitable_package python3-requests
1403
# suitable_package python3-pip