17498: address review comments.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 99905dc0f0ab12d1b68432d7a06fbd99879b8900..f9db56a5ff56d69ed5e3095b386eaaf6883ac5a4 100755 (executable)
--- 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 59a9e4f47de15dabafb1aaaac85478befb2c45a2..06aec50501d4572c163d2f0a5ed88ba950e474eb 100755 (executable)
--- 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 e132305f0fc02d26398e71130b93c181fc68e03f..09eaa8e552c8e6a887cc8e4ce5b0047928024bbc 100644 (file)
--- 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 626ef7d1a3c5d4bf2bed96d4a8e33892cdba0b7b..7d9bb6f200253405b15fbd3edaed82132efe61e4 100644 (file)
--- 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 25f1cda3b25d17d812c33471967573dab68e4d56..0416d3dbd2cc6eaddcf780326bca845c2cb55710 100644 (file)
--- 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
 -------------