From 57f2cba0dfce2eca7dbb9b6f670f5472d52e77d8 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 18 Nov 2020 15:23:36 -0500 Subject: [PATCH] 17022: Make this a fully packaged tool. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- build/run-build-packages-one-target.sh | 3 ++- build/run-build-packages.sh | 3 +++ tools/user-activity/setup.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh index 72f814836b..8365fecadb 100755 --- a/build/run-build-packages-one-target.sh +++ b/build/run-build-packages-one-target.sh @@ -222,7 +222,8 @@ if test -z "$packages" ; then python3-arvados-fuse python3-arvados-python-client python3-arvados-cwl-runner - python3-crunchstat-summary" + python3-crunchstat-summary + python3-arvados-user-activity" fi FINAL_EXITCODE=0 diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index 8d55e2fd9b..ddb21c4cca 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -327,6 +327,9 @@ fpm_build_virtualenv "crunchstat-summary" "tools/crunchstat-summary" "python3" # The Docker image cleaner fpm_build_virtualenv "arvados-docker-cleaner" "services/dockercleaner" "python3" +# The Arvados crunchstat-summary tool +fpm_build_virtualenv "arvados-user-activity" "tools/user-activity" "python3" + # The cwltest package, which lives out of tree cd "$WORKSPACE" if [[ -e "$WORKSPACE/cwltest" ]]; then diff --git a/tools/user-activity/setup.py b/tools/user-activity/setup.py index 6be50c49cc..6e00a5680d 100755 --- a/tools/user-activity/setup.py +++ b/tools/user-activity/setup.py @@ -16,7 +16,7 @@ README = os.path.join(SETUP_DIR, 'README.rst') import arvados_version version = arvados_version.get_version(SETUP_DIR, "arvados_user_activity") -setup(name='arvados_user_activity', +setup(name='arvados-user-activity', version=version, description='Summarize user activity from Arvados audit logs', author='Arvados', @@ -31,7 +31,7 @@ setup(name='arvados_user_activity', ('share/doc/arvados_user_activity', ['agpl-3.0.txt']), ], install_requires=[ - 'arvados-python-client', + 'arvados-python-client > 2.2.0.dev20201118185221', ], zip_safe=True, ) -- 2.30.2