Commit 303cee0e authored by Boris Glimcher's avatar Boris Glimcher Committed by Tomasz Zawadzki
Browse files

scripts/pkgdep: consolidate pip install and remove code dup 



Change-Id: Ifbaae7285dcf0f40765dbe985ef19566147f176a
Signed-off-by: default avatarBoris Glimcher <Boris.Glimcher@emc.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26822


Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarMichal Berger <michal.berger@nutanix.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@nutanix.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarKonrad Sztyber <ksztyber@nvidia.com>
parent 604bd5fe

scripts/pkgdep/arch.sh

+1 −10
Original line number Diff line number Diff line
@@ -13,17 +13,8 @@ pacman -Sy --needed --noconfirm python-pexpect python-pip libffi 
virtdir=${PIP_VIRTDIR:-/var/spdk/dependencies/pip}

python3 -m venv --upgrade-deps --system-site-packages "$virtdir"

source "$virtdir/bin/activate"

pip install -r "$rootdir/scripts/pkgdep/requirements.txt"



# install python packages

pip install configshell_fb

pip install pyelftools

pip install ijson

pip install python-magic

pip install grpcio

pip install grpcio-tools

pip install pyyaml

pip install Jinja2

pip install tabulate

# Additional dependencies for DPDK

pacman -Sy --needed --noconfirm numactl nasm

# Additional dependencies for ISA-L used in compression

scripts/pkgdep/debian.sh

+1 −11
Original line number Diff line number Diff line
@@ -21,18 +21,8 @@ else 
fi

pkgdep_toolpath pip "$virtdir/bin"

source "$virtdir/bin/activate"

pip3 install -r "$rootdir/scripts/pkgdep/requirements.txt"



# install python packages

pip3 install ninja

pip3 install meson

pip3 install pyelftools

pip3 install ijson

pip3 install python-magic

pip3 install grpcio

pip3 install grpcio-tools

pip3 install pyyaml

pip3 install Jinja2

pip3 install tabulate

# Additional dependencies for SPDK CLI

apt-get install -y python3-configshell-fb python3-pexpect

scripts/pkgdep/mariner.sh

+1 −14
Original line number Diff line number Diff line
@@ -74,19 +74,6 @@ if [[ ! -e /usr/bin/python ]]; then 
	ln -s /usr/bin/python3 /usr/bin/python

fi



pips=(

	meson

	ninja

	pyelftools

	ijson

	python-magic

	pyyaml

	grpcio

	grpcio-tools

	Jinja2

	tabulate

)



if ((EUID == 0)); then

	cat <<- WARNING

		Warning: Running as root. You may want to install the pip packages
@@ -98,6 +85,6 @@ if ((EUID == 0)); then 
	WARNING

fi



pip3 install "${pips[@]}"

pip3 install -r "$rootdir/scripts/pkgdep/requirements.txt"



additional_dependencies

scripts/pkgdep/requirements.txt

+1 −5
Original line number Diff line number Diff line 
paramiko

pexpect

pandas

tabulate

configshell-fb

pyparsing

ninja

meson

scikit-build

grpcio

grpcio-tools

pyelftools

ijson

python-magic

pyyaml

Jinja2

scripts/pkgdep/rhel.sh

+2 −11
Original line number Diff line number Diff line
@@ -128,17 +128,8 @@ if echo "$ID $VERSION_ID" | grep -E -q 'centos 8|rhel 8|rocky 8'; then 
else

	yum install -y python python3-devel

fi

pip3 install ninja

pip3 install meson

pip3 install pyelftools

pip3 install ijson

pip3 install python-magic

pip3 install Jinja2

pip3 install pandas

pip3 install tabulate

pip3 install grpcio

pip3 install grpcio-tools

pip3 install pyyaml



pip3 install -r "$rootdir/scripts/pkgdep/requirements.txt"



# Additional dependencies for SPDK CLI

yum install -y python3-configshell python3-pexpect