Commit 7fc3de14 by Peter Eacmen

we no longer need to bifurcate python3 and python2 deps

parent f7a77ed1
......@@ -2,6 +2,7 @@ os: linux
dist: bionic
language: python
arch: amd64
sudo: true
addons:
apt:
update: true
......
......@@ -62,7 +62,7 @@ fi
PYTHON3_APT_CANDIDATES=""
PYTHON3_YUM_CANDIDATES=""
YUM_CANDIDATES="git gcc gcc-c++ make openssl-devel qtwebkit-devel qt-devel gzip bzip2 tar arj p7zip p7zip-plugins cabextract squashfs-tools zlib zlib-devel lzo lzo-devel xz xz-compat-libs xz-libs xz-devel xz-lzma-compat python-backports-lzma lzip pyliblzma perl-Compress-Raw-Lzma lzop srecord"
PIP_COMMANDS="pip3"
PIP_COMMANDS="pip"
# Check for root privileges
if [ $UID -eq 0 ]
......@@ -134,11 +134,7 @@ function install_ubireader
function install_pip_package
{
PACKAGE="$1"
for PIP_COMMAND in $PIP_COMMANDS
do
$SUDO $PIP_COMMAND install $PACKAGE
done
$SUDO pip install $PACKAGE
}
function find_path
......@@ -243,14 +239,6 @@ then
exit 1
fi
# Check to see if we should install modules for python3 as well
find_path python3
if [ $? -eq 0 ]
then
PKG_CANDIDATES="$PKG_CANDIDATES $PKG_PYTHON3_CANDIDATES"
PIP_COMMANDS="pip3 $PIP_COMMANDS"
fi
# Do the install(s)
cd /tmp
$SUDO $PKGCMD $PKGCMD_OPTS $PKG_CANDIDATES
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment