[arvados] updated: 2.7.0-6506-gaead670cda
git repository hosting
git at public.arvados.org
Fri Apr 26 10:56:31 UTC 2024
Summary of changes:
build/package-build-dockerfiles/Makefile | 11 +-
.../package-build-dockerfiles/debian11/Dockerfile | 47 ++++----
.../package-build-dockerfiles/debian12/Dockerfile | 46 +++----
build/package-build-dockerfiles/rocky8/Dockerfile | 31 ++---
.../ubuntu2004/Dockerfile | 47 +++++---
.../ubuntu2204/Dockerfile | 47 ++++----
build/package-test-dockerfiles/.gitignore | 1 -
build/package-test-dockerfiles/Makefile | 42 -------
build/package-test-dockerfiles/debian11/Dockerfile | 20 +--
build/package-test-dockerfiles/debian12/Dockerfile | 20 +--
build/package-test-dockerfiles/rocky8/Dockerfile | 21 ++--
.../package-test-dockerfiles/ubuntu2004/Dockerfile | 20 +--
.../package-test-dockerfiles/ubuntu2204/Dockerfile | 20 +--
.../common-test-rails-server-package.sh | 2 +-
build/rails-package-scripts/postinst.sh | 59 +++++----
build/run-build-packages-one-target.sh | 12 +-
build/run-build-packages-python-and-ruby.sh | 7 --
build/run-build-packages.sh | 11 +-
build/run-library.sh | 37 +++++-
build/run-tests.sh | 134 ++++++---------------
doc/_includes/_install_ruby_and_bundler.liquid | 64 +---------
doc/admin/config-urls.html.textile.liquid | 4 -
doc/install/install-api-server.html.textile.liquid | 4 -
lib/boot/passenger.go | 11 +-
lib/install/deps.go | 6 +-
sdk/cwl/setup.py | 6 -
sdk/cwl/tests/test_container.py | 3 +-
sdk/cwl/tests/test_fsaccess.py | 3 +-
sdk/cwl/tests/test_make_output.py | 3 +-
sdk/cwl/tests/test_pathmapper.py | 3 +-
sdk/cwl/tests/test_submit.py | 18 +--
sdk/cwl/tests/test_tq.py | 3 +-
sdk/cwl/tests/test_urljoin.py | 3 +-
sdk/cwl/tests/test_util.py | 3 +-
sdk/python/arvados/commands/arv_copy.py | 1 -
sdk/python/setup.py | 12 +-
sdk/python/tests/arvados_testutil.py | 11 +-
sdk/python/tests/test_api.py | 2 +-
sdk/python/tests/test_arv_get.py | 3 +-
sdk/python/tests/test_arv_keepdocker.py | 3 +-
sdk/python/tests/test_arv_ls.py | 3 +-
sdk/python/tests/test_arv_put.py | 3 +-
sdk/python/tests/test_arvfile.py | 3 +-
sdk/python/tests/test_cache.py | 4 +-
sdk/python/tests/test_collections.py | 3 +-
sdk/python/tests/test_events.py | 3 +-
sdk/python/tests/test_http.py | 5 +-
sdk/python/tests/test_keep_client.py | 5 +-
sdk/python/tests/test_retry.py | 3 +-
sdk/python/tests/test_retry_job_helpers.py | 2 +-
sdk/python/tests/test_sdk.py | 3 +-
sdk/python/tests/test_stream.py | 3 +-
sdk/python/tests/test_vocabulary.py | 3 +-
services/api/Gemfile.lock | 2 +-
.../api/test/integration/bundler_version_test.rb | 19 +++
services/fuse/setup.py | 2 +-
services/fuse/tests/test_command_args.py | 3 +-
services/fuse/tests/test_inodes.py | 3 +-
services/fuse/tests/test_mount.py | 3 +-
services/fuse/tests/test_retry.py | 4 +-
services/fuse/tests/test_token_expiry.py | 3 +-
tools/arvbox/lib/arvbox/docker/common.sh | 5 +-
tools/crunchstat-summary/setup.py | 1 -
tools/crunchstat-summary/tests/test_examples.py | 3 +-
64 files changed, 345 insertions(+), 547 deletions(-)
delete mode 100644 build/package-test-dockerfiles/Makefile
create mode 100644 services/api/test/integration/bundler_version_test.rb
via aead670cda417803f2c79b50cf1ea7463c8e37c4 (commit)
via fb19cf980838b541a50af8a27ccf8058409b88e4 (commit)
via 62fcd8ec4b25399920be44bc53a44d4870674f7b (commit)
via 938820eafbced89b90b289ee49c1a05d27defd4e (commit)
via af0fee9476bcf6c3c089e66138247af3f98bcf94 (commit)
via 8a795bf668174147e9f254fa3af9b0be4a14a973 (commit)
via 0d46f526ae182d831a899b07cc373f41e0679204 (commit)
via 964083b35ae64c6d9206c18eea6783f90a184154 (commit)
via f560aa12166357b3cd10194024f1556631f27587 (commit)
via 1d55eb8597807b8dbe66b605fd34882341372720 (commit)
via 7a2406a1fbcbf5a476d403f109630c252b5fba60 (commit)
via bef00883acf5a11705e0c2f597a4af67a9ba71ce (commit)
via 8cc4d00917134d3257b1a59d4823532f9e235f00 (commit)
via ffb2409fc6c7c37d86b490fa8a1465da6ceaa354 (commit)
via 24e3397d88f64e7f71b4378ea93cb3e60a1b7f5c (commit)
via bfb1c2befc24e5706ac2917e723aaf93638df886 (commit)
via 8b91442e262317e7760554b4bf0b6d7ef8fd30d3 (commit)
via f249cb9de50e7da3806aca5f07ed7e733b9dbc7e (commit)
via 7e2165a5b7561f0c84ede6ab4ae58003a1551a48 (commit)
via f5056b8816239a98d398b6eba7caf9b683f463ca (commit)
via 36638bfb8b0b35b7db7e1c9469520e3e3d473d11 (commit)
via 792a7d47b560d4aa80e2cb8a933a11e02e3109b3 (commit)
via db63621695faccb88efec35db638a2e73051db80 (commit)
via eea348ebde75aba35c5675ae70aac0fb520274f5 (commit)
via fc7146bddad4f4cf7d90cd7e7ad507b66aee043f (commit)
via b7aaa7602a6d2a2a29d325965d04ffc49dfbf30a (commit)
via 9e278e167bcede690e699436d5653b5c1b41cfc5 (commit)
via ed268e53d2014ce5c49301559a46e67660f1404c (commit)
via c5e28c9012ff802ee35c43cbf3e2b5127850f96c (commit)
from 26000157646912481b60f3785354e8eef76154f4 (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 aead670cda417803f2c79b50cf1ea7463c8e37c4
Merge: fb19cf9808 8a795bf668
Author: Brett Smith <brett.smith at curii.com>
Date: Fri Apr 26 06:55:12 2024 -0400
Merge branch '21721-refresh-python-deps'
Refs #21721.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
commit fb19cf980838b541a50af8a27ccf8058409b88e4
Merge: 2600015764 62fcd8ec4b
Author: Brett Smith <brett.smith at curii.com>
Date: Fri Apr 26 06:54:59 2024 -0400
Merge branch '21700-remove-rvm'
Closes #21700.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
commit 62fcd8ec4b25399920be44bc53a44d4870674f7b
Author: Brett Smith <brett.smith at curii.com>
Date: Fri Apr 26 06:53:29 2024 -0400
21700: Tighten Gemfile.lock parsing
Avoid a bug if some subsection comes after `specs` under `GEM`.
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 53e3d0a52c..6fdc4aafcd 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -538,9 +538,10 @@ handle_rails_package() {
mkdir -p vendor/cache
awk -- '
BEGIN { OFS="\0"; ORS="\0"; }
-(/^[[:space:]]*$/) { level=0; }
-($0 == "GEM" || $0 == " specs:") { level+=1; }
-(level == 2 && NF == 2 && $1 ~ /^[[:alpha:]][-_[:alnum:]]*$/ && $2 ~ /^\([[:digit:]]+[-_+.[:alnum:]]*\)$/) {
+(/^[A-Z ]*$/) { level1=$0; }
+(/^ [[:alpha:]]+:$/) { level2=substr($0, 3, length($0) - 3); next; }
+(/^ {0,3}[[:alpha:]]/) { level2=""; next; }
+(level1 == "GEM" && level2 == "specs" && NF == 2 && $1 ~ /^[[:alpha:]][-_[:alnum:]]*$/ && $2 ~ /\([[:digit:]]+[-_+.[:alnum:]]*\)$/) {
print "--version", substr($2, 2, length($2) - 2), $1;
}
' Gemfile.lock | env -C vendor/cache xargs -0r --max-args=3 gem fetch
commit 938820eafbced89b90b289ee49c1a05d27defd4e
Author: Brett Smith <brett.smith at curii.com>
Date: Fri Apr 26 05:39:36 2024 -0400
21700: Remove arvbox special case from run-tests.sh
This was already a noop after ed268e53d2014ce5c49301559a46e67660f1404c,
and I suspect it's no longer necessary now that we do a better job of
standardizing the Bundler version anywhere, thanks in part to the
version locking added in Bundler 2.3.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/build/run-tests.sh b/build/run-tests.sh
index 7089fb8668..13ea0946e6 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -492,12 +492,6 @@ setup_ruby_environment() {
echo "Gem search path is GEM_PATH=$GEM_PATH"
gem install --user --no-document --conservative --version '~> 2.4.0' bundler \
|| fatal 'install bundler'
- if test -d /var/lib/arvados-arvbox/ ; then
- # Inside arvbox, use bundler-installed binstubs. The
- # system bundler and rail's own bin/bundle refuse to work.
- # I don't know why.
- bundle=binstubs/bundle
- fi
}
with_test_gemset() {
commit af0fee9476bcf6c3c089e66138247af3f98bcf94
Author: Brett Smith <brett.smith at curii.com>
Date: Fri Apr 26 05:39:21 2024 -0400
21700: Modernize arvbox bundler install recipe
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 54ec9403ad..40a540ac80 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -2,9 +2,6 @@
#
# SPDX-License-Identifier: AGPL-3.0
-export RUBY_VERSION=3.2.2
-export BUNDLER_VERSION=2.4.22
-
export DEBIAN_FRONTEND=noninteractive
export PATH=${PATH}:/usr/local/go/bin:/var/lib/arvados/bin:/opt/arvados-py/bin:/usr/src/arvados/sdk/cli/binstubs
export npm_config_cache=/var/lib/npm
@@ -66,7 +63,7 @@ else
fi
run_bundler() {
- flock $GEMLOCK /var/lib/arvados/bin/gem install --no-document --user bundler:$BUNDLER_VERSION
+ flock $GEMLOCK /var/lib/arvados/bin/gem install --conservative --no-document --user --version '~> 2.4.0' bundler
BUNDLER=bundle
if test -x $PWD/bin/bundle ; then
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list