17022: Make this a fully packaged tool.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 72f814836b3ce36b1a56f0c2221c9d9b50b8c485..8365fecadbd29705924623374ba21763f934185e 100755 (executable)
--- 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-arvados-fuse
         python3-arvados-python-client
         python3-arvados-cwl-runner

-        python3-crunchstat-summary"
+        python3-crunchstat-summary
+        python3-arvados-user-activity"

 fi
 
 FINAL_EXITCODE=0
 fi
 
 FINAL_EXITCODE=0

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 8d55e2fd9be7d3cf0f47e179b2645e8fca89d540..ddb21c4cca6b10bdffcd7244601e1c89b56eee7d 100755 (executable)
--- 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 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
 # 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 6be50c49cce67ae49e655fb450d66492eff27f85..6e00a5680d0de47f7ed67a1ce696e5ffde01ec07 100755 (executable)
--- 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")
 
 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',
       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=[
           ('share/doc/arvados_user_activity', ['agpl-3.0.txt']),
       ],
       install_requires=[

-          'arvados-python-client',
+          'arvados-python-client > 2.2.0.dev20201118185221',

       ],
       zip_safe=True,
 )
       ],
       zip_safe=True,
 )