[arvados] updated: 2.7.2-16-g62a9c49afd

git repository hosting git at public.arvados.org
Tue May 28 17:53:54 UTC 2024


Summary of changes:
 build/run-build-packages-python-and-ruby.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

       via  62a9c49afdbb219b40789d43306a4dba62263b85 (commit)
      from  9032ec6ee7f4ee21241fa7d940c99c5814801538 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 62a9c49afdbb219b40789d43306a4dba62263b85
Author: Brett Smith <brett.smith at curii.com>
Date:   Tue May 28 12:17:59 2024 -0400

    21840: Add wheels to the Jenkins Python package build
    
    We were previously doing this in run_upload_packages. Now that that tool
    is doing pure uploads with twine, we need to build the wheels in Jenkins
    instead.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/run-build-packages-python-and-ruby.sh b/build/run-build-packages-python-and-ruby.sh
index 599fe7cf96..3156516d51 100755
--- a/build/run-build-packages-python-and-ruby.sh
+++ b/build/run-build-packages-python-and-ruby.sh
@@ -51,12 +51,19 @@ gem_wrapper() {
 
 handle_python_package () {
   # This function assumes the current working directory is the python package directory
-  if [ -n "$(find dist -name "*-$(nohash_version_from_git).tar.gz" -print -quit)" ]; then
+  local -a pkg_fmts=()
+  local version="$(nohash_version_from_git)"
+  if [[ -z "$(find dist -name "*-$version.tar.gz" -print -quit)" ]]; then
+    pkg_fmts+=(sdist)
+  fi
+  if [[ -z "$(find dist -name "*-$version.whl" -print -quit)" ]]; then
+    pkg_fmts+=(bdist_wheel)
+  fi
+  if [[ "${#pkg_fmts[@]}" -eq 0 ]]; then
     echo "This package doesn't need rebuilding."
-    return
+  else
+    python3 setup.py $DASHQ_UNLESS_DEBUG "${pkg_fmts[@]}"
   fi
-  # Make sure only to use sdist - that's the only format pip can deal with (sigh)
-  python3 setup.py $DASHQ_UNLESS_DEBUG sdist
 }
 
 python_wrapper() {

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list