[ARVADOS] updated: 2.1.0-633-gd87dfd1cd

[Git user]

Summary of changes:
 build/run-build-packages.sh                   | 2 +-
 build/run-library.sh                          | 4 ----
 doc/sdk/python/sdk-python.html.textile.liquid | 4 ++--
 lib/cli/external.go                           | 2 +-
 services/fuse/README.rst                      | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

       via  d87dfd1cdb38f1c872ed465dcfd214590980db21 (commit)
      from  9516ddc7158e077743a0daffb36e77a16a59c736 (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 d87dfd1cdb38f1c872ed465dcfd214590980db21
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Apr 13 11:51:39 2021 -0400

    17498: address review comments.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 99905dc0f..f9db56a5f 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -333,7 +333,7 @@ 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-cleanere" "services/dockercleaner"
+build_metapackage "arvados-docker-cleaner" "services/dockercleaner"
 build_metapackage "arvados-user-activity" "tools/user-activity"
 
 # The cwltest package, which lives out of tree
diff --git a/build/run-library.sh b/build/run-library.sh
index 59a9e4f47..06aec5050 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -621,10 +621,6 @@ fpm_build_virtualenv () {
   LICENSE_STRING=`grep license $WORKSPACE/$PKG_DIR/setup.py|cut -f2 -d=|sed -e "s/[',\\"]//g"`
   COMMAND_ARR+=('--license' "$LICENSE_STRING")
 
-  #if [[ "$FORMAT" != "rpm" ]]; then
-  #  COMMAND_ARR+=('--conflicts' "python-$PKG")
-  #fi
-
   if [[ "$DEBUG" != "0" ]]; then
     COMMAND_ARR+=('--verbose' '--log' 'info')
   fi
diff --git a/doc/sdk/python/sdk-python.html.textile.liquid b/doc/sdk/python/sdk-python.html.textile.liquid
index e132305f0..09eaa8e55 100644
--- a/doc/sdk/python/sdk-python.html.textile.liquid
+++ b/doc/sdk/python/sdk-python.html.textile.liquid
@@ -66,7 +66,7 @@ Type "help", "copyright", "credits" or "license" for more information.
 If you installed from a distribution package (option 2): the package includes a virtualenv, which means the correct Python environment needs to be loaded before the Arvados SDK can be imported. This can be done by activating the virtualenv first:
 
 <notextile>
-<pre>~$ <code class="userinput">source /usr/share/python2.7/dist/python-arvados-python-client/bin/activate</code>
+<pre>~$ <code class="userinput">source /usr/share/python3/dist/python3-arvados-python-client/bin/activate</code>
 (python-arvados-python-client) ~$ <code class="userinput">python</code>
 Python 3.7.3 (default, Jul 25 2020, 13:03:44)
 [GCC 8.3.0] on linux
@@ -80,7 +80,7 @@ Type "help", "copyright", "credits" or "license" for more information.
 Or alternatively, by using the Python executable from the virtualenv directly:
 
 <notextile>
-<pre>~$ <code class="userinput">/usr/share/python2.7/dist/python-arvados-python-client/bin/python</code>
+<pre>~$ <code class="userinput">/usr/share/python3/dist/python3-arvados-python-client/bin/python</code>
 Python 3.7.3 (default, Jul 25 2020, 13:03:44)
 [GCC 8.3.0] on linux
 Type "help", "copyright", "credits" or "license" for more information.
diff --git a/lib/cli/external.go b/lib/cli/external.go
index 626ef7d1a..7d9bb6f20 100644
--- a/lib/cli/external.go
+++ b/lib/cli/external.go
@@ -113,7 +113,7 @@ https://doc.arvados.org/install for more details.
 Note: This subcommand uses the "arvados" Python module. If that is
 not installed, try:
 * "pip install arvados" (either as root or in a virtualenv), or
-* "sudo apt-get install python-arvados-python-client", or
+* "sudo apt-get install python3-arvados-python-client", or
 * see https://doc.arvados.org/install for more details.
 
 `
diff --git a/services/fuse/README.rst b/services/fuse/README.rst
index 25f1cda3b..0416d3dbd 100644
--- a/services/fuse/README.rst
+++ b/services/fuse/README.rst
@@ -42,7 +42,7 @@ Installing on Debian systems
 
 2. Update your package list.
 
-3. Install the ``python-arvados-fuse`` package.
+3. Install the ``python3-arvados-fuse`` package.
 
 Configuration
 -------------

-----------------------------------------------------------------------


hooks/post-receive
--