install-dependencies.sh: add scylla-driver to relocatable python3

Pass --pip-packages option to tools/python3/reloc/build_reloc.sh,
add scylla-driver to relocatable python3 which required for
fix_system_distributed_tables.py.

[avi: regenrate toolchain]

Ref #9040
This commit is contained in:
Takuya ASADA
2021-03-01 15:12:35 +09:00
committed by Avi Kivity
parent cfcea8fc33
commit 729d0feef0
3 changed files with 24 additions and 3 deletions

View File

@@ -95,6 +95,7 @@ i18n_xlat = {
}
python3_dependencies = subprocess.run('./install-dependencies.sh --print-python3-runtime-packages', shell=True, capture_output=True, encoding='utf-8').stdout.strip()
pip_dependencies = subprocess.run('./install-dependencies.sh --print-pip-runtime-packages', shell=True, capture_output=True, encoding='utf-8').stdout.strip()
node_exporter_filename = subprocess.run('./install-dependencies.sh --print-node-exporter-filename', shell=True, capture_output=True, encoding='utf-8').stdout.strip()
node_exporter_dirname = os.path.basename(node_exporter_filename).rstrip('.tar.gz')
@@ -2095,7 +2096,7 @@ with open(buildfile_tmp, 'w') as f:
build tools/python3/build/{scylla_product}-python3-{arch}-package.tar.gz: build-submodule-reloc
reloc_dir = tools/python3
args = --packages "{python3_dependencies}"
args = --packages "{python3_dependencies}" --pip-packages "{pip_dependencies}"
build dist-python3-rpm: build-submodule-rpm tools/python3/build/{scylla_product}-python3-{arch}-package.tar.gz
dir = tools/python3
artifact = $builddir/{scylla_product}-python3-{arch}-package.tar.gz

View File

@@ -110,6 +110,13 @@ fedora_python3_packages=(
python3-setuptools
python3-psutil
python3-distro
python3-click
python3-six
)
pip_packages=(
scylla-driver
geomet
)
centos_packages=(
@@ -206,11 +213,13 @@ print_usage() {
echo "Usage: install-dependencies.sh [OPTION]..."
echo ""
echo " --print-python3-runtime-packages Print required python3 packages for Scylla"
echo " --print-pip-runtime-packages Print required pip packages for Scylla"
echo " --print-node-exporter-filename Print node_exporter filename"
exit 1
}
PRINT_PYTHON3=false
PRINT_PIP=false
PRINT_NODE_EXPORTER=false
while [ $# -gt 0 ]; do
case "$1" in
@@ -218,6 +227,10 @@ while [ $# -gt 0 ]; do
PRINT_PYTHON3=true
shift 1
;;
"--print-pip-runtime-packages")
PRINT_PIP=true
shift 1
;;
"--print-node-exporter-filename")
PRINT_NODE_EXPORTER=true
shift 1
@@ -237,6 +250,11 @@ if $PRINT_PYTHON3; then
exit 0
fi
if $PRINT_PIP; then
echo "${pip_packages[@]}"
exit 0
fi
if $PRINT_NODE_EXPORTER; then
node_exporter_fullpath
exit 0
@@ -266,7 +284,9 @@ elif [ "$ID" = "fedora" ]; then
exit 1
fi
yum install -y "${fedora_packages[@]}" "${fedora_python3_packages[@]}"
pip3 install cassandra-driver
pip3 install "geomet<0.3,>=0.1"
# Disable C extensions
pip3 install scylla-driver --install-option="--no-murmur3" --install-option="--no-libev" --install-option="--no-cython"
if [ -f "$(node_exporter_fullpath)" ] && node_exporter_checksum; then
echo "$(node_exporter_filename) already exists, skipping download"

View File

@@ -1 +1 @@
docker.io/scylladb/scylla-toolchain:fedora-34-20210812
docker.io/scylladb/scylla-toolchain:fedora-34-20210902