Fix: pin setuptools to 65.7.0 everywhere

Issue-ID: RELENG-4562
Signed-off-by: Kevin Sandi <ksandi@contractor.linuxfoundation.org>
Change-Id: Idf7d1538ef38af3aeaf5444986a8932acada8904

diff --git a/releasenotes/notes/pin-setuptools-b1eaff0e563502be.yaml b/releasenotes/notes/pin-setuptools-b1eaff0e563502be.yaml
new file mode 100644 (file)
index 0000000..b573af0
--- /dev/null
+++ b/releasenotes/notes/pin-setuptools-b1eaff0e563502be.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Pin setuptools to the latest version before v66.0.0 to avoid PEP-440
+    non conforming versions errors while packages we use fix their version
+    string formats to be compatible. To maintain congruency we are pinning
+    setuptools to 65.7.0 in all places under global-jjb.

diff --git a/shell/jjb-merge-job.sh b/shell/jjb-merge-job.sh
index 9a497fd..3b34fa8 100644 (file)
--- a/shell/jjb-merge-job.sh
+++ b/shell/jjb-merge-job.sh
@@ -18,6 +18,6 @@ set -eu -o pipefail
 # shellcheck disable=SC1090
 source ~/lf-env.sh
 
-lf-activate-venv jenkins-job-builder
+lf-activate-venv jenkins-job-builder setuptools==65.7.0
 
 jenkins-jobs update --recursive --delete-old --workers "$workers" jjb/

diff --git a/shell/node-install.sh b/shell/node-install.sh
index 7200ea3..52500b0 100644 (file)
--- a/shell/node-install.sh
+++ b/shell/node-install.sh
@@ -17,7 +17,7 @@ set -e -o pipefail
 virtualenv --quiet "/tmp/v/python"
 # shellcheck source=/tmp/v/node/bin/activate disable=SC1091
 source "/tmp/v/python/bin/activate"
-pip install --quiet --upgrade "pip==9.0.3" setuptools
+pip install --quiet --upgrade "pip==9.0.3" setuptools==65.7.0
 pip install --quiet --upgrade nodeenv
 
 # installs are silent, show version details in log

diff --git a/shell/pypi-dist-build.sh b/shell/pypi-dist-build.sh
index 4bc0a77..5ed4d33 100644 (file)
--- a/shell/pypi-dist-build.sh
+++ b/shell/pypi-dist-build.sh
@@ -20,7 +20,7 @@ set -eu -o pipefail
 source ~/lf-env.sh
 
 # Version controlled by JJB_VERSION
-lf-activate-venv setuptools twine wheel readline
+lf-activate-venv setuptools==65.7.0 twine wheel readline
 
 bdist=""
 if $BUILD_BDIST_WHEEL; then

diff --git a/shell/pypi-upload.sh b/shell/pypi-upload.sh
index fee5766..539fd61 100644 (file)
--- a/shell/pypi-upload.sh
+++ b/shell/pypi-upload.sh
@@ -21,7 +21,7 @@ set -eu -o pipefail
 source ~/lf-env.sh
 
 # Version controlled by JJB_VERSION
-lf-activate-venv setuptools twine wheel readline
+lf-activate-venv setuptools==65.7.0 twine wheel readline
 
 
 echo "INFO: cd to tox-dir $TOX_DIR"

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 59fb970..4c528d2 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -73,7 +73,7 @@ EOF
     python3 -m pip install --quiet --upgrade pip
     # TODO: temporarily pinning setuptools to avoid plugin version format issues
     # https://github.com/pypa/setuptools/issues/3772#issuecomment-1384342813
-    python3 -m pip install --quiet --no-warn-script-location --upgrade setuptools<66.0.0
+    python3 -m pip install --quiet --no-warn-script-location --upgrade setuptools==65.7.0
     python3 -m pip install --quiet --no-warn-script-location --upgrade lftools[openstack]
     python3 -m pip install --quiet --no-warn-script-location --upgrade \
         --upgrade-strategy eager -r "$requirements_file"