[arvados] updated: 2.7.0-5674-gb39854290b
git repository hosting
git at public.arvados.org
Thu Jan 4 19:45:14 UTC 2024
Summary of changes:
build/run-build-packages.sh | 8 --
build/run-library.sh | 231 ++++++--------------------------------------
2 files changed, 29 insertions(+), 210 deletions(-)
via b39854290b52d4e35e7c4c8ce4a256bce82114df (commit)
via a8e7f58af3cc30b3bf4bcf1967bf00dab343543e (commit)
from c11ae3f057030bf247be90a6cdec06847c889f13 (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 b39854290b52d4e35e7c4c8ce4a256bce82114df
Author: Brett Smith <brett.smith at curii.com>
Date: Thu Jan 4 14:15:43 2024 -0500
20846/21230: Remove Python transitional metapackages from the package build
The build process for this is relatively expensive (we set up a
dedicated virtualenv for each one) and not PEP 668-compliant (it tries
to upgrade packages globally). We don't need these packages anymore for
the Arvados 3.0 release. Stop building all of them.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 4d6b34c163..355aadb41b 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -293,14 +293,6 @@ fpm_build_virtualenv "arvados-docker-cleaner" "services/dockercleaner" "$FORMAT"
# The Arvados user activity tool
fpm_build_virtualenv "arvados-user-activity" "tools/user-activity" "$FORMAT" "$ARCH"
-# The python->python3 metapackages
-build_metapackage "arvados-fuse" "services/fuse"
-build_metapackage "arvados-python-client" "services/fuse"
-build_metapackage "arvados-cwl-runner" "sdk/cwl"
-build_metapackage "crunchstat-summary" "tools/crunchstat-summary"
-build_metapackage "arvados-docker-cleaner" "services/dockercleaner"
-build_metapackage "arvados-user-activity" "tools/user-activity"
-
# The cwltest package, which lives out of tree
handle_cwltest "$FORMAT" "$ARCH"
diff --git a/build/run-library.sh b/build/run-library.sh
index d8b2575487..c8564f5ac7 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -593,8 +593,6 @@ handle_cwltest () {
# signal to our build script that we want a cwltest executable installed in /usr/bin/
mkdir cwltest/bin && touch cwltest/bin/cwltest
fpm_build_virtualenv "cwltest" "cwltest" "$package_format" "$target_arch"
- # The python->python3 metapackage
- build_metapackage "cwltest" "cwltest"
cd "$WORKSPACE"
rm -rf "$WORKSPACE/cwltest"
}
@@ -922,136 +920,6 @@ EOF
echo
}
-# build_metapackage builds meta packages that help with the python to python 3 package migration
-build_metapackage() {
- # base package name (e.g. arvados-python-client)
- BASE_NAME=$1
- shift
- PKG_DIR=$1
- shift
-
- if [[ -n "$ONLY_BUILD" ]] && [[ "python-$BASE_NAME" != "$ONLY_BUILD" ]]; then
- return 0
- fi
-
- if [[ "$ARVADOS_BUILDING_ITERATION" == "" ]]; then
- ARVADOS_BUILDING_ITERATION=1
- fi
-
- if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then
- cd $WORKSPACE/$PKG_DIR
- pwd
- rm -rf dist/*
-
- # Get the latest setuptools
- if ! pip3 install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'; then
- echo "Error, unable to upgrade setuptools with XY"
- echo " pip3 install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'"
- exit 1
- fi
- # filter a useless warning (when building the cwltest package) from the stderr output
- if ! python3 setup.py $DASHQ_UNLESS_DEBUG sdist 2> >(grep -v 'warning: no previously-included files matching'); then
- echo "Error, unable to run python3 setup.py sdist for $PKG"
- exit 1
- fi
-
- PYTHON_VERSION=$(awk '($1 == "Version:"){print $2}' *.egg-info/PKG-INFO)
- UNFILTERED_PYTHON_VERSION=$(echo -n $PYTHON_VERSION | sed s/\.dev/~dev/g |sed 's/\([0-9]\)rc/\1~rc/g')
-
- else
- UNFILTERED_PYTHON_VERSION=$ARVADOS_BUILDING_VERSION
- PYTHON_VERSION=$(echo -n $ARVADOS_BUILDING_VERSION | sed s/~dev/.dev/g | sed s/~rc/rc/g)
- fi
-
- cd - >$STDOUT_IF_DEBUG
- if [[ -d "$BASE_NAME" ]]; then
- rm -rf $BASE_NAME
- fi
- mkdir $BASE_NAME
- cd $BASE_NAME
-
- if [[ "$FORMAT" == "deb" ]]; then
- cat >ns-control <<EOF
-Section: misc
-Priority: optional
-Standards-Version: 3.9.2
-
-Package: python-${BASE_NAME}
-Version: ${PYTHON_VERSION}-${ARVADOS_BUILDING_ITERATION}
-Maintainer: Arvados Package Maintainers <packaging at arvados.org>
-Depends: python3-${BASE_NAME}
-Description: metapackage to ease the upgrade to the Pyhon 3 version of ${BASE_NAME}
- This package is a metapackage that will automatically install the new version of
- ${BASE_NAME} which is Python 3 based and has a different name.
-EOF
-
- /usr/bin/equivs-build ns-control
- if [[ $? -ne 0 ]]; then
- echo "Error running 'equivs-build ns-control', is the 'equivs' package installed?"
- return 1
- fi
- elif [[ "$FORMAT" == "rpm" ]]; then
- cat >meta.spec <<EOF
-Summary: metapackage to ease the upgrade to the Python 3 version of ${BASE_NAME}
-Name: python-${BASE_NAME}
-Version: ${PYTHON_VERSION}
-Release: ${ARVADOS_BUILDING_ITERATION}
-License: distributable
-
-Requires: python3-${BASE_NAME}
-
-%description
-This package is a metapackage that will automatically install the new version of
-python-${BASE_NAME} which is Python 3 based and has a different name.
-
-%prep
-
-%build
-
-%clean
-
-%install
-
-%post
-
-%files
-
-
-%changelog
-* Mon Apr 12 2021 Arvados Package Maintainers <packaging at arvados.org>
-- initial release
-EOF
-
- /usr/bin/rpmbuild -ba meta.spec
- if [[ $? -ne 0 ]]; then
- echo "Error running 'rpmbuild -ba meta.spec', is the 'rpm-build' package installed?"
- return 1
- else
- mv /root/rpmbuild/RPMS/x86_64/python-${BASE_NAME}*.${FORMAT} .
- if [[ $? -ne 0 ]]; then
- echo "Error finding rpm file output of 'rpmbuild -ba meta.spec'"
- return 1
- fi
- fi
- else
- echo "Unknown format"
- return 1
- fi
-
- if [[ $EXITCODE -ne 0 ]]; then
- return 1
- else
- echo `ls *$FORMAT`
- mv *$FORMAT $WORKSPACE/packages/$TARGET/
- fi
-
- # clean up
- cd - >$STDOUT_IF_DEBUG
- if [[ -d "$BASE_NAME" ]]; then
- rm -rf $BASE_NAME
- fi
-}
-
# Build packages for everything
fpm_build() {
# Source dir where fpm-info.sh (if any) will be found.
commit a8e7f58af3cc30b3bf4bcf1967bf00dab343543e
Author: Brett Smith <brett.smith at curii.com>
Date: Thu Jan 4 14:00:46 2024 -0500
20846/21230: Modernize virtualenv setup in package building
This change sets up the virtualenv earlier, then does all work inside
it, starting with installing build dependencies, to comply with PEP 668.
A couple optimizations that were easy to do as part of this work:
* We install modules in as few pip commands as possible, to reduce
the overhead of determining what's currently installed, what's
available from PyPI, etc.
* Removed a special case for CentOS 7 that we no longer need.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/build/run-library.sh b/build/run-library.sh
index 7a70ed23a5..d8b2575487 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -710,28 +710,32 @@ fpm_build_virtualenv_worker () {
cd $WORKSPACE/$PKG_DIR
rm -rf dist/*
+ local venv_dir="dist/build/usr/share/$python/dist/$PYTHON_PKG"
+ echo "Creating virtualenv..."
+ if ! "$python" -m venv "$venv_dir"; then
+ printf "Error, unable to run\n %s -m venv %s\n" "$python" "$venv_dir"
+ exit 1
+ fi
- # Get the latest setuptools.
- #
- # Note "pip3 install setuptools" fails on debian12 ("error:
- # externally-managed-environment") even if that requirement is
- # already satisfied, so we parse "pip3 list" output instead to check
- # whether we need to do anything.
- if [[ "$($pip list | grep -P -o '^setuptools\s+\K[0-9]+')" -ge 66 ]]; then
- : # OK, already installed
- elif ! $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools>=66'; then
- echo "Error, unable to upgrade setuptools with"
- echo " $pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools>=66'"
+ local venv_py="$venv_dir/bin/python3"
+ if ! "$venv_py" -m pip install --upgrade $DASHQ_UNLESS_DEBUG $CACHE_FLAG pip setuptools wheel; then
+ printf "Error, unable to upgrade pip, setuptools, and wheel with
+ %s -m pip install --upgrade $DASHQ_UNLESS_DEBUG $CACHE_FLAG pip setuptools wheel
+" "$venv_py"
exit 1
fi
+ cat <<EOF
+pip version: $("$venv_py" -m pip --version)
+setuptools version: $("$venv_py" -c 'import setuptools; print(setuptools.__version__)')
+wheel version: $("$venv_dir/bin/wheel" version)
+EOF
+
# filter a useless warning (when building the cwltest package) from the stderr output
- if ! $python setup.py $DASHQ_UNLESS_DEBUG sdist 2> >(grep -v 'warning: no previously-included files matching'); then
- echo "Error, unable to run $python setup.py sdist for $PKG"
+ if ! "$venv_py" setup.py $DASHQ_UNLESS_DEBUG sdist 2> >(grep -v 'warning: no previously-included files matching'); then
+ echo "Error, unable to run $venv_py setup.py sdist for $PKG"
exit 1
fi
- PACKAGE_PATH=`(cd dist; ls *tar.gz)`
-
if [[ "arvados-python-client" == "$PKG" ]]; then
PYSDK_PATH="-f $(pwd)/dist/"
fi
@@ -750,67 +754,22 @@ fpm_build_virtualenv_worker () {
fi
# See if we actually need to build this package; does it exist already?
- # We can't do this earlier than here, because we need PYTHON_VERSION...
- # This isn't so bad; the sdist call above is pretty quick compared to
- # the invocation of virtualenv and fpm, below.
+ # We can't do this earlier than here, because we need PYTHON_VERSION.
if ! test_package_presence "$PYTHON_PKG" "$UNFILTERED_PYTHON_VERSION" "$python" "$ARVADOS_BUILDING_ITERATION" "$target_arch"; then
return 0
fi
echo "Building $package_format ($target_arch) package for $PKG from $PKG_DIR"
- # Package the sdist in a virtualenv
- echo "Creating virtualenv..."
-
- cd dist
-
- rm -rf build
- rm -f $PYTHON_PKG*deb
- echo "virtualenv version: `virtualenv --version`"
- virtualenv_command="virtualenv --python `which $python` $DASHQ_UNLESS_DEBUG build/usr/share/$python/dist/$PYTHON_PKG"
-
- if ! $virtualenv_command; then
- echo "Error, unable to run"
- echo " $virtualenv_command"
- exit 1
- fi
-
- if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U pip; then
- echo "Error, unable to upgrade pip with"
- echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U pip"
+ local sdist_path="$(ls dist/*.tar.gz)"
+ if ! "$venv_py" -m pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PYSDK_PATH "$sdist_path"; then
+ printf "Error, unable to run
+ %s -m pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG %s %s
+" "$venv_py" "$PYSDK_PATH" "$sdist_path"
exit 1
fi
- echo "pip version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip --version`"
- if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'; then
- echo "Error, unable to upgrade setuptools with"
- echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U 'setuptools<45'"
- exit 1
- fi
- echo "setuptools version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/$python -c 'import setuptools; print(setuptools.__version__)'`"
-
- if ! build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U wheel; then
- echo "Error, unable to upgrade wheel with"
- echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG -U wheel"
- exit 1
- fi
- echo "wheel version: `build/usr/share/$python/dist/$PYTHON_PKG/bin/wheel version`"
-
- if [[ "$TARGET" != "centos7" ]] || [[ "$PYTHON_PKG" != "python-arvados-fuse" ]]; then
- build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PYSDK_PATH $PACKAGE_PATH
- else
- # centos7 needs these special tweaks to install python-arvados-fuse
- build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG docutils
- PYCURL_SSL_LIBRARY=nss build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PYSDK_PATH $PACKAGE_PATH
- fi
-
- if [[ "$?" != "0" ]]; then
- echo "Error, unable to run"
- echo " build/usr/share/$python/dist/$PYTHON_PKG/bin/$pip install $DASHQ_UNLESS_DEBUG $CACHE_FLAG $PYSDK_PATH $PACKAGE_PATH"
- exit 1
- fi
-
- cd build/usr/share/$python/dist/$PYTHON_PKG/
+ pushd "$venv_dir" >$STDOUT_IF_DEBUG
# Replace the shebang lines in all python scripts, and handle the activate
# scripts too. This is a functional replacement of the 237 line
@@ -832,10 +791,10 @@ fpm_build_virtualenv_worker () {
fi
done
- cd - >$STDOUT_IF_DEBUG
+ popd >$STDOUT_IF_DEBUG
+ cd dist
- find build -iname '*.pyc' -exec rm {} \;
- find build -iname '*.pyo' -exec rm {} \;
+ find build -iname '*.py[co]' -delete
# Finally, generate the package
echo "Creating package..."
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list