Update pypi-publish to meet latest standards
The software being used to build the package was significantly out of
date, and was attempting to push a package using a naming scheme that
PyPI no longer supports. This change ensures we are using the latest
versions available, on a newer runner.
This change also updates a local python requirement that was also
very out of date.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I3459f76bd0bab6c6c66036670cd01e7f5173bb97
diff --git a/jjb/shell/pypi-publish.sh b/jjb/shell/pypi-publish.sh
index 3118df7..8b3f486 100755
--- a/jjb/shell/pypi-publish.sh
+++ b/jjb/shell/pypi-publish.sh
@@ -56,6 +56,13 @@
pushd "$pymoddir"
echo "Building python module in '$pymoddir'"
+ # Activate venv (created by Makefile) and get latest packages
+ if [[ -f .venv/bin/activate ]]; then
+ source .venv/bin/activate
+ fi
+ pip install --upgrade pip
+ pip install --upgrade setuptools pkginfo wheel twine
+ python3 setup.py sdist
# Create source distribution
python setup.py sdist
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index 91d0e31..47bfd79 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -30,5 +30,6 @@
- 'pypi-publish':
project-regexp: '^{name}$'
dependency-jobs: 'version-tag_wildcard'
+ build-node: ubuntu22.04-basebuild-4c-8g
# [EOF]
diff --git a/requirements.txt b/requirements.txt
index 957764d..e4e07fd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------
-jenkins-job-builder==4.1.0
+jenkins-job-builder==6.4.1
pipdeptree
jenkins-jobs