From 8e11925a2b438a7dd4af2e74fad2bc0bc18f5feb Mon Sep 17 00:00:00 2001
From: Martin Klozik <martinx.klozik@intel.com>
Date: Mon, 12 Mar 2018 09:37:49 +0000
Subject: pylint: Add pylint into requirements.txt
Pylint installation was part of vsperf installation scripts, which is
not following vsperf generic approach to add all required python
packages into requirements.txt. It also means, that the same
version of pylint is used for verification of all patches at given
server. This is causing issues in case, that different versions
of pylint are required to verify vsperf code, e.g. older version
might be required to verify patches of previous OPNFV release.
Pylint with exact version number was added into requirements.txt,
so correct version of pylint is used for verification of vspef code.
JIRA: VSPERF-563
Change-Id: I48c9cacd87f016e6047ed965728d3b8d63e6461f
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Richard Elias <richardx.elias@intel.com>
---
ci/build-vsperf.sh | 9 ---------
requirements.txt | 1 +
systems/centos/prepare_python_env.sh | 1 -
systems/fedora/24/prepare_python_env.sh | 3 +--
systems/fedora/25/prepare_python_env.sh | 1 -
systems/fedora/26/prepare_python_env.sh | 1 -
systems/opensuse/42.2/prepare_python_env.sh | 1 -
systems/opensuse/42.3/prepare_python_env.sh | 1 -
systems/opensuse/prepare_python_env.sh | 1 -
systems/rhel/7.2/prepare_python_env.sh | 3 +--
systems/rhel/7.3/prepare_python_env.sh | 3 +--
systems/sles/15/prepare_python_env.sh | 1 -
systems/ubuntu/14.04/prepare_python_env.sh | 3 +--
13 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh
index a8da6a80..cfe964ef 100755
--- a/ci/build-vsperf.sh
+++ b/ci/build-vsperf.sh
@@ -433,15 +433,6 @@ function dependencies_check() {
sudo apt-get install -y $PACKAGE
fi
done
- # install additional python packages into python environment
- for PACKAGE in "pylint" ; do
- if pip show $PACKAGE &> /dev/null ; then
- printf " %-70s %-6s\n" $PACKAGE "OK"
- else
- printf " %-70s %-6s\n" $PACKAGE "missing"
- pip install $PACKAGE
- fi
- done
echo
fi
}
diff --git a/requirements.txt b/requirements.txt
index 3a366d70..00108452 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,7 @@ xmlrunner==1.7.7
requests==2.8.1
netaddr==0.7.18
scapy-python3==0.18
+pylint==1.5.6
pyzmq==14.5.0
distro
stcrestclient
diff --git a/systems/centos/prepare_python_env.sh b/systems/centos/prepare_python_env.sh
index ac7ccba4..108ba1f6 100755
--- a/systems/centos/prepare_python_env.sh
+++ b/systems/centos/prepare_python_env.sh
@@ -25,5 +25,4 @@ scl enable rh-python34 "
virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python34/root/usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
"
diff --git a/systems/fedora/24/prepare_python_env.sh b/systems/fedora/24/prepare_python_env.sh
index 920604c2..bc93f703 100644
--- a/systems/fedora/24/prepare_python_env.sh
+++ b/systems/fedora/24/prepare_python_env.sh
@@ -25,5 +25,4 @@ fi
(virtualenv-3.5 "$VSPERFENV_DIR" --python /usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
-pip install -r ../requirements.txt
-pip install pylint)
+pip install -r ../requirements.txt)
diff --git a/systems/fedora/25/prepare_python_env.sh b/systems/fedora/25/prepare_python_env.sh
index c4613ca4..b5df11ee 100644
--- a/systems/fedora/25/prepare_python_env.sh
+++ b/systems/fedora/25/prepare_python_env.sh
@@ -26,5 +26,4 @@ fi
(virtualenv-3.5 "$VSPERFENV_DIR" --python /usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
pip install six)
diff --git a/systems/fedora/26/prepare_python_env.sh b/systems/fedora/26/prepare_python_env.sh
index 05eedfd9..4db2eaed 100644
--- a/systems/fedora/26/prepare_python_env.sh
+++ b/systems/fedora/26/prepare_python_env.sh
@@ -26,5 +26,4 @@ fi
(virtualenv-3.6 "$VSPERFENV_DIR" --python /usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
pip install six)
diff --git a/systems/opensuse/42.2/prepare_python_env.sh b/systems/opensuse/42.2/prepare_python_env.sh
index ab668ca4..a563740a 100755
--- a/systems/opensuse/42.2/prepare_python_env.sh
+++ b/systems/opensuse/42.2/prepare_python_env.sh
@@ -24,5 +24,4 @@ fi
virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
diff --git a/systems/opensuse/42.3/prepare_python_env.sh b/systems/opensuse/42.3/prepare_python_env.sh
index ab668ca4..a563740a 100755
--- a/systems/opensuse/42.3/prepare_python_env.sh
+++ b/systems/opensuse/42.3/prepare_python_env.sh
@@ -24,5 +24,4 @@ fi
virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
diff --git a/systems/opensuse/prepare_python_env.sh b/systems/opensuse/prepare_python_env.sh
index 69871670..6ac196f0 100755
--- a/systems/opensuse/prepare_python_env.sh
+++ b/systems/opensuse/prepare_python_env.sh
@@ -24,5 +24,4 @@ fi
virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
diff --git a/systems/rhel/7.2/prepare_python_env.sh b/systems/rhel/7.2/prepare_python_env.sh
index e137aaab..047d6961 100755
--- a/systems/rhel/7.2/prepare_python_env.sh
+++ b/systems/rhel/7.2/prepare_python_env.sh
@@ -25,5 +25,4 @@ scl enable rh-python34 "
virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python34/root/usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
-"
\ No newline at end of file
+"
diff --git a/systems/rhel/7.3/prepare_python_env.sh b/systems/rhel/7.3/prepare_python_env.sh
index e137aaab..047d6961 100755
--- a/systems/rhel/7.3/prepare_python_env.sh
+++ b/systems/rhel/7.3/prepare_python_env.sh
@@ -25,5 +25,4 @@ scl enable rh-python34 "
virtualenv "$VSPERFENV_DIR" --python /opt/rh/rh-python34/root/usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
-"
\ No newline at end of file
+"
diff --git a/systems/sles/15/prepare_python_env.sh b/systems/sles/15/prepare_python_env.sh
index 12ada3cc..18b0e545 100755
--- a/systems/sles/15/prepare_python_env.sh
+++ b/systems/sles/15/prepare_python_env.sh
@@ -24,5 +24,4 @@ fi
virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
pip install -r ../requirements.txt
-pip install pylint
diff --git a/systems/ubuntu/14.04/prepare_python_env.sh b/systems/ubuntu/14.04/prepare_python_env.sh
index 4c98dc42..f3d92dce 100755
--- a/systems/ubuntu/14.04/prepare_python_env.sh
+++ b/systems/ubuntu/14.04/prepare_python_env.sh
@@ -25,5 +25,4 @@ fi
(virtualenv "$VSPERFENV_DIR" --python /usr/bin/python3
source "$VSPERFENV_DIR"/bin/activate
-pip install -r ../requirements.txt
-pip install pylint)
+pip install -r ../requirements.txt)
--
cgit