aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-06-04 13:22:49 -0400
committerJim Hahn <jrh3@att.com>2021-06-04 13:24:59 -0400
commitfe3e91c55264ba67b5130b9841e30b634ac157a6 (patch)
treee2b5f845fd8aa191a6fadee3a0affaf568ae2580
parent8f44cb7dc7737433324083c0c307bf954d535200 (diff)
Don't use pip3 wrapper script
The pip3 script generates a warning saying to use "python3 -m pip" instead. Modified the code as such. Issue-ID: POLICY-3155 Change-Id: I852583bea88b6d4b969a1aba20e7b9193fa24732 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--csit/apex-pdp/plans/setup.sh6
-rw-r--r--csit/api/plans/setup.sh6
-rw-r--r--csit/distribution/plans/setup.sh6
-rwxr-xr-xcsit/drools-applications/plans/setup.sh6
-rwxr-xr-xcsit/drools-pdp/plans/setup.sh6
-rw-r--r--csit/include-raw-integration-install-robotframework.sh3
-rw-r--r--csit/pap/plans/setup.sh6
-rwxr-xr-xcsit/prepare-csit.sh4
-rw-r--r--csit/xacml-pdp/plans/setup.sh6
9 files changed, 25 insertions, 24 deletions
diff --git a/csit/apex-pdp/plans/setup.sh b/csit/apex-pdp/plans/setup.sh
index 89f780a0..a81e9446 100644
--- a/csit/apex-pdp/plans/setup.sh
+++ b/csit/apex-pdp/plans/setup.sh
@@ -23,9 +23,9 @@
source ${SCRIPTS}/get-branch-mariadb.sh
echo "Uninstall docker-py and reinstall docker."
-pip3 uninstall -y docker-py
-pip3 uninstall -y docker
-pip3 install -U docker
+python3 -m pip uninstall -y docker-py
+python3 -m pip uninstall -y docker
+python3 -m pip install -U docker
sudo apt-get -y install libxml2-utils
diff --git a/csit/api/plans/setup.sh b/csit/api/plans/setup.sh
index 28d08b75..d20540d9 100644
--- a/csit/api/plans/setup.sh
+++ b/csit/api/plans/setup.sh
@@ -22,9 +22,9 @@
source ${SCRIPTS}/get-branch-mariadb.sh
echo "Uninstall docker-py and reinstall docker."
-pip3 uninstall -y docker-py
-pip3 uninstall -y docker
-pip3 install -U docker
+python3 -m pip uninstall -y docker-py
+python3 -m pip uninstall -y docker
+python3 -m pip install -U docker
sudo apt-get -y install libxml2-utils
diff --git a/csit/distribution/plans/setup.sh b/csit/distribution/plans/setup.sh
index 54ee68f1..8fc2b9ab 100644
--- a/csit/distribution/plans/setup.sh
+++ b/csit/distribution/plans/setup.sh
@@ -23,9 +23,9 @@
source ${SCRIPTS}/get-branch-mariadb.sh
echo "Uninstall docker-py and reinstall docker."
-pip3 uninstall -y docker-py
-pip3 uninstall -y docker
-pip3 install -U docker
+python3 -m pip uninstall -y docker-py
+python3 -m pip uninstall -y docker
+python3 -m pip install -U docker
sudo apt-get -y install libxml2-utils
diff --git a/csit/drools-applications/plans/setup.sh b/csit/drools-applications/plans/setup.sh
index f8ca6326..097b31c9 100755
--- a/csit/drools-applications/plans/setup.sh
+++ b/csit/drools-applications/plans/setup.sh
@@ -20,9 +20,9 @@
source ${SCRIPTS}/get-branch-mariadb.sh
echo "Uninstall docker-py and reinstall docker."
-pip3 uninstall -y docker-py
-pip3 uninstall -y docker
-pip3 install -U docker
+python3 -m pip uninstall -y docker-py
+python3 -m pip uninstall -y docker
+python3 -m pip install -U docker
sudo apt-get -y install libxml2-utils
diff --git a/csit/drools-pdp/plans/setup.sh b/csit/drools-pdp/plans/setup.sh
index 3f3624fa..6b02e76a 100755
--- a/csit/drools-pdp/plans/setup.sh
+++ b/csit/drools-pdp/plans/setup.sh
@@ -22,9 +22,9 @@ source ${SCRIPTS}/get-branch-mariadb.sh
# OS upgrades
echo "Uninstall docker-py and reinstall docker."
-pip3 uninstall -y docker-py
-pip3 uninstall -y docker
-pip3 install -U docker
+python3 -m pip uninstall -y docker-py
+python3 -m pip uninstall -y docker
+python3 -m pip install -U docker
sudo apt-get -y install libxml2-utils
diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh
index 8375e736..ca589b45 100644
--- a/csit/include-raw-integration-install-robotframework.sh
+++ b/csit/include-raw-integration-install-robotframework.sh
@@ -3,6 +3,7 @@
##############################################################################
# Copyright (c) 2015 The Linux Foundation and others.
# Modification Copyright 2021. Nordix Foundation.
+# Modification Copyright 2021 AT&T Intellectual Property. All rights reserved.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -31,4 +32,4 @@ python3 -m pip install --upgrade pip
echo "Installing Python Requirements"
python3 -m pip install -r pylibs.txt
odltools -V
-pip3 freeze
+python3 -m pip freeze
diff --git a/csit/pap/plans/setup.sh b/csit/pap/plans/setup.sh
index 97cdb307..f65e857f 100644
--- a/csit/pap/plans/setup.sh
+++ b/csit/pap/plans/setup.sh
@@ -22,9 +22,9 @@
source ${SCRIPTS}/get-branch-mariadb.sh
echo "Uninstall docker-py and reinstall docker."
-pip3 uninstall -y docker-py
-pip3 uninstall -y docker
-pip3 install -U docker
+python3 -m pip uninstall -y docker-py
+python3 -m pip uninstall -y docker
+python3 -m pip install -U docker
sudo apt-get -y install libxml2-utils
bash ${SCRIPTS}/get-models-examples.sh
diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh
index e154a12b..9625c48b 100755
--- a/csit/prepare-csit.sh
+++ b/csit/prepare-csit.sh
@@ -39,6 +39,6 @@ fi
# install eteutils
mkdir -p ${ROBOT_VENV}/src/onap
rm -rf ${ROBOT_VENV}/src/onap/testsuite
-pip3 install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5.1.*' --pre
+python3 -m pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5.1.*' --pre
-pip3 freeze
+python3 -m pip freeze
diff --git a/csit/xacml-pdp/plans/setup.sh b/csit/xacml-pdp/plans/setup.sh
index cf369ab9..93ce9bfb 100644
--- a/csit/xacml-pdp/plans/setup.sh
+++ b/csit/xacml-pdp/plans/setup.sh
@@ -20,9 +20,9 @@
source ${SCRIPTS}/get-branch-mariadb.sh
echo "Uninstall docker-py and reinstall docker."
-pip3 uninstall -y docker-py
-pip3 uninstall -y docker
-pip3 install -U docker
+python3 -m pip uninstall -y docker-py
+python3 -m pip uninstall -y docker
+python3 -m pip install -U docker
sudo apt-get -y install libxml2-utils
bash ${SCRIPTS}/get-models-examples.sh