Merge branch '17022-user-activity-report' refs #17022

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

diff --combined build/run-build-packages-python-and-ruby.sh
index f255307607c492468f567e7f649c6dcd0818b919,871641fcdb3ab6c0ececc85947c631719c76d8aa..599fe7cf965d8274fbc4841170c866ba42e40895
--- 1/build/run-build-packages-python-and-ruby.sh
--- 2/build/run-build-packages-python-and-ruby.sh
+++ b/build/run-build-packages-python-and-ruby.sh
@@@ -6,6 -6,7 +6,6 @@@
  COLUMNS=80
  
  . `dirname "$(readlink -f "$0")"`/run-library.sh
 -#. `dirname "$(readlink -f "$0")"`/libcloud-pin.sh
  
  read -rd "\000" helpmessage <<EOF
  $(basename $0): Build Arvados Python packages and Ruby gems
@@@ -49,16 -50,6 +49,16 @@@ gem_wrapper() 
    title "End of $gem_name gem build (`timer`)"
  }
  
 +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
 +    echo "This package doesn't need rebuilding."
 +    return
 +  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() {
    local package_name="$1"; shift
    local package_directory="$1"; shift
@@@ -203,6 -194,8 +203,8 @@@ if [ $PYTHON -eq 1 ]; the
    python_wrapper arvados-python-client "$WORKSPACE/sdk/python"
    python_wrapper arvados-cwl-runner "$WORKSPACE/sdk/cwl"
    python_wrapper arvados_fuse "$WORKSPACE/services/fuse"
+   python_wrapper crunchstat_summary "$WORKSPACE/tools/crunchstat-summary"
+   python_wrapper arvados-user-activity "$WORKSPACE/tools/user-activity"
  
    if [ $((${#failures[@]} - $GEM_BUILD_FAILURES)) -ne 0 ]; then
      PYTHON_BUILD_FAILURES=$((${#failures[@]} - $GEM_BUILD_FAILURES))

diff --combined doc/api/methods.html.textile.liquid
index ae96d0a3b5872dd17f1d5e91bec856ad7845c6b3,b0a3c5e2f8eecbca60bd4062f3b8a6fbff13a282..d6c34f4d3f5984633ea24de000303c6275f8a42e
--- 1/doc/api/methods.html.textile.liquid
--- 2/doc/api/methods.html.textile.liquid
+++ b/doc/api/methods.html.textile.liquid
@@@ -73,9 -73,9 +73,9 @@@ table(table table-bordered table-conden
  |limit   |integer|Maximum number of resources to return.  If not provided, server will provide a default limit.  Server may also impose a maximum number of records that can be returned in a single request.|query|
  |offset  |integer|Skip the first 'offset' number of resources that would be returned under the given filter conditions.|query|
  |filters |array  |"Conditions for selecting resources to return.":#filters|query|
- |order   |array  |Attributes to use as sort keys to determine the order resources are returned, each optionally followed by @asc@ or @desc@ to indicate ascending or descending order.
+ |order   |array  |Attributes to use as sort keys to determine the order resources are returned, each optionally followed by @asc@ or @desc@ to indicate ascending or descending order.  (If not specified, it will be ascending).
  Example: @["head_uuid asc","modified_at desc"]@
- Default: @["created_at desc"]@|query|
+ Default: @["modified_at desc", "uuid asc"]@|query|
  |select  |array  |Set of attributes to include in the response.
  Example: @["head_uuid","tail_uuid"]@
  Default: all available attributes.  As a special case, collections do not return "manifest_text" unless explicitly selected.|query|
@@@ -103,7 -103,7 +103,7 @@@ table(table table-bordered table-conden
  |@=@, @!=@|string, number, timestamp, or null|Equality comparison|@["tail_uuid","=","xyzzy-j7d0g-fffffffffffffff"]@ @["tail_uuid","!=",null]@|
  |@<@, @<=@, @>=@, @>@|string, number, or timestamp|Ordering comparison|@["script_version",">","123"]@|
  |@like@, @ilike@|string|SQL pattern match.  Single character match is @_@ and wildcard is @%@. The @ilike@ operator is case-insensitive|@["script_version","like","d00220fb%"]@|
 -|@in@, @not in@|array of strings|Set membership|@["script_version","in",["master","d00220fb38d4b85ca8fc28a8151702a2b9d1dec5"]]@|
 +|@in@, @not in@|array of strings|Set membership|@["script_version","in",["main","d00220fb38d4b85ca8fc28a8151702a2b9d1dec5"]]@|
  |@is_a@|string|Arvados object type|@["head_uuid","is_a","arvados#collection"]@|
  |@exists@|string|Test if a subproperty is present.|@["properties","exists","my_subproperty"]@|