From 3e646ecf38466b7b33cfb0548b043e6ca7b2225c Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Mon, 26 Oct 2020 19:33:10 -0400 Subject: [PATCH] 17044: implement review comments (part 1). Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/build-dev-docker-jobs-image.sh | 10 +++++----- doc/_includes/_install_ruby_and_bundler.liquid | 12 ++++++------ doc/sdk/cli/install.html.textile.liquid | 2 +- .../python/arvados-cwl-runner.html.textile.liquid | 8 +------- doc/sdk/python/arvados-fuse.html.textile.liquid | 10 ++-------- doc/sdk/python/sdk-python.html.textile.liquid | 10 ++-------- doc/sdk/ruby/index.html.textile.liquid | 2 +- docker/jobs/Dockerfile | 2 +- sdk/cwl/fpm-info.sh | 2 +- sdk/dev-jobs.dockerfile | 4 ++-- sdk/python/README.rst | 4 ++-- services/dockercleaner/fpm-info.sh | 2 +- 12 files changed, 25 insertions(+), 43 deletions(-) diff --git a/build/build-dev-docker-jobs-image.sh b/build/build-dev-docker-jobs-image.sh index 3fb1da7990..0e570d5f31 100755 --- a/build/build-dev-docker-jobs-image.sh +++ b/build/build-dev-docker-jobs-image.sh @@ -16,7 +16,7 @@ Syntax: WORKSPACE=path Path to the Arvados source tree to build packages from CWLTOOL=path (optional) Path to cwltool git repository. SALAD=path (optional) Path to schema_salad git repository. -PYCMD=pythonexec (optional) Specify the python executable to use in the docker image. Defaults to "python3". +PYCMD=pythonexec (optional) Specify the python3 executable to use in the docker image. Defaults to "python3". EOF @@ -45,16 +45,16 @@ if [[ $py = python3 ]] ; then pipcmd=pip3 fi -(cd sdk/python && python setup.py sdist) +(cd sdk/python && python3 setup.py sdist) sdk=$(cd sdk/python/dist && ls -t arvados-python-client-*.tar.gz | head -n1) -(cd sdk/cwl && python setup.py sdist) +(cd sdk/cwl && python3 setup.py sdist) runner=$(cd sdk/cwl/dist && ls -t arvados-cwl-runner-*.tar.gz | head -n1) rm -rf sdk/cwl/salad_dist mkdir -p sdk/cwl/salad_dist if [[ -n "$SALAD" ]] ; then - (cd "$SALAD" && python setup.py sdist) + (cd "$SALAD" && python3 setup.py sdist) salad=$(cd "$SALAD/dist" && ls -t schema-salad-*.tar.gz | head -n1) cp "$SALAD/dist/$salad" $WORKSPACE/sdk/cwl/salad_dist fi @@ -62,7 +62,7 @@ fi rm -rf sdk/cwl/cwltool_dist mkdir -p sdk/cwl/cwltool_dist if [[ -n "$CWLTOOL" ]] ; then - (cd "$CWLTOOL" && python setup.py sdist) + (cd "$CWLTOOL" && python3 setup.py sdist) cwltool=$(cd "$CWLTOOL/dist" && ls -t cwltool-*.tar.gz | head -n1) cp "$CWLTOOL/dist/$cwltool" $WORKSPACE/sdk/cwl/cwltool_dist fi diff --git a/doc/_includes/_install_ruby_and_bundler.liquid b/doc/_includes/_install_ruby_and_bundler.liquid index 90c9225569..7be699d3fb 100644 --- a/doc/_includes/_install_ruby_and_bundler.liquid +++ b/doc/_includes/_install_ruby_and_bundler.liquid @@ -73,11 +73,11 @@ Finally, install Bundler: h2(#fromsource). Option 3: Install from source -Install prerequisites for Debian 8: +Install prerequisites for Debian 10: 
sudo apt-get install \
-    bison build-essential gettext libcurl3 libcurl3-gnutls \
+    bison build-essential gettext libcurl4 \
     libcurl4-openssl-dev libpcre3-dev libreadline-dev \
     libssl-dev libxslt1.1 zlib1g-dev
@@ -91,13 +91,13 @@ Install prerequisites for CentOS 7: make automake libtool bison sqlite-devel tar -Install prerequisites for Ubuntu 12.04 or 14.04: +Install prerequisites for Ubuntu 16.04: 
sudo apt-get install \
-    gawk g++ gcc make libc6-dev libreadline6-dev zlib1g-dev libssl-dev \
-    libyaml-dev libsqlite3-dev sqlite3 autoconf libgdbm-dev \
-    libncurses5-dev automake libtool bison pkg-config libffi-dev curl
+    bison build-essential gettext libcurl3 \
+    libcurl3-openssl-dev libpcre3-dev libreadline-dev \
+    libssl-dev libxslt1.1 zlib1g-dev
Build and install Ruby: diff --git a/doc/sdk/cli/install.html.textile.liquid b/doc/sdk/cli/install.html.textile.liquid index 3c60bdfe3a..9657d236ad 100644 --- a/doc/sdk/cli/install.html.textile.liquid +++ b/doc/sdk/cli/install.html.textile.liquid @@ -17,7 +17,7 @@ h2. Prerequisites # "Install Ruby":../../install/ruby.html # "Install the Python SDK":../python/sdk-python.html -The SDK uses @curl@ which depends on the @libcurl@ C library. To build the module you may have to install additional packages. On Debian 9 this is: +The SDK uses @curl@ which depends on the @libcurl@ C library. To build the module you may have to install additional packages. On Debian 10 this is: 
 $ apt-get install build-essential libcurl4-openssl-dev
diff --git a/doc/sdk/python/arvados-cwl-runner.html.textile.liquid b/doc/sdk/python/arvados-cwl-runner.html.textile.liquid
index 9faedb8dc1..1cfbd60545 100644
--- a/doc/sdk/python/arvados-cwl-runner.html.textile.liquid
+++ b/doc/sdk/python/arvados-cwl-runner.html.textile.liquid
@@ -32,13 +32,7 @@ Run @pip install arvados-cwl-runner@ in an appropriate installation environment,
 
 Note:
 
-The SDK uses @pycurl@ which depends on the @libcurl@ C library.  To build the module you may have to first install additional packages.  On Debian 9 this is:
-
-
-$ apt-get install git build-essential python-dev libcurl4-openssl-dev libssl1.0-dev python-llfuse
-

-
-For Python 3 this is:
+The SDK uses @pycurl@ which depends on the @libcurl@ C library.  To build the module you may have to first install additional packages.  On Debian 10 this is:
 
 
 $ apt-get install git build-essential python3-dev libcurl4-openssl-dev libssl1.0-dev python3-llfuse
diff --git a/doc/sdk/python/arvados-fuse.html.textile.liquid b/doc/sdk/python/arvados-fuse.html.textile.liquid
index 0ac2d0c7e1..04dca2c849 100644
--- a/doc/sdk/python/arvados-fuse.html.textile.liquid
+++ b/doc/sdk/python/arvados-fuse.html.textile.liquid
@@ -32,16 +32,10 @@ Run @pip install arvados_fuse@ in an appropriate installation environment, such
 
 Note:
 
-The SDK uses @pycurl@ which depends on the @libcurl@ C library.  To build the module you may have to first install additional packages.  On Debian 9 this is:
+The SDK uses @pycurl@ which depends on the @libcurl@ C library.  To build the module you may have to first install additional packages.  On Debian 10 this is:
 
 
-$ apt-get install git build-essential python-dev libcurl4-openssl-dev libssl1.0-dev python-llfuse
-

-
-For Python 3 this is:
-
-
-$ apt-get install git build-essential python3-dev libcurl4-openssl-dev libssl1.0-dev python3-llfuse
+$ apt-get install git build-essential python3-dev libcurl4-openssl-dev libssl-dev python3-llfuse
 

 
 h3. Usage
diff --git a/doc/sdk/python/sdk-python.html.textile.liquid b/doc/sdk/python/sdk-python.html.textile.liquid
index 2915d554d9..e132305f0f 100644
--- a/doc/sdk/python/sdk-python.html.textile.liquid
+++ b/doc/sdk/python/sdk-python.html.textile.liquid
@@ -38,16 +38,10 @@ Run @pip install arvados-python-client@ in an appropriate installation environme
 
 Note:
 
-The SDK uses @pycurl@ which depends on the @libcurl@ C library.  To build the module you may have to first install additional packages.  On Debian 9 this is:
+The SDK uses @pycurl@ which depends on the @libcurl@ C library.  To build the module you may have to first install additional packages.  On Debian 10 this is:
 
 
-$ apt-get install git build-essential python-dev libcurl4-openssl-dev libssl1.0-dev
-

-
-For Python 3 this is
-
-
-$ apt-get install git build-essential python3-dev libcurl4-openssl-dev libssl1.0-dev
+$ apt-get install git build-essential python3-dev libcurl4-openssl-dev libssl-dev
 

 
 If your version of @pip@ is 1.4 or newer, the @pip install@ command might give an error: "Could not find a version that satisfies the requirement arvados-python-client". If this happens, try @pip install --pre arvados-python-client@.
diff --git a/doc/sdk/ruby/index.html.textile.liquid b/doc/sdk/ruby/index.html.textile.liquid
index 6f06722d23..b3b97244ba 100644
--- a/doc/sdk/ruby/index.html.textile.liquid
+++ b/doc/sdk/ruby/index.html.textile.liquid
@@ -22,7 +22,7 @@ h3. Prerequisites
 
 # "Install Ruby":../../install/ruby.html
 
-The SDK uses @curl@ which depends on the @libcurl@ C library.  To build the module you may have to install additional packages.  On Debian 9 this is:
+The SDK uses @curl@ which depends on the @libcurl@ C library.  To build the module you may have to install additional packages.  On Debian 10 this is:
 
 
 $ apt-get install build-essential libcurl4-openssl-dev
diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 69ea34bc81..8da58a682d 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# Based on Debian Stretch
+# Based on Debian
 FROM debian:buster-slim
 MAINTAINER Arvados Package Maintainers 
 
diff --git a/sdk/cwl/fpm-info.sh b/sdk/cwl/fpm-info.sh
index 50ebd25ff8..9a52ee7021 100644
--- a/sdk/cwl/fpm-info.sh
+++ b/sdk/cwl/fpm-info.sh
@@ -5,7 +5,7 @@
 fpm_depends+=(nodejs)
 
 case "$TARGET" in
-    debian9 | ubuntu1604)
+    ubuntu1604)
         fpm_depends+=(libcurl3-gnutls)
         ;;
     debian* | ubuntu*)
diff --git a/sdk/dev-jobs.dockerfile b/sdk/dev-jobs.dockerfile
index f7719dbc43..1e0068ffd4 100644
--- a/sdk/dev-jobs.dockerfile
+++ b/sdk/dev-jobs.dockerfile
@@ -13,8 +13,8 @@
 # (This dockerfile file must be located in the arvados/sdk/ directory because
 #  of the docker build root.)
 
-FROM debian:9
-MAINTAINER Peter Amstutz 
+FROM debian:buster-slim
+MAINTAINER Arvados Package Maintainers 
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/sdk/python/README.rst b/sdk/python/README.rst
index a03d6afe6a..570e398a28 100644
--- a/sdk/python/README.rst
+++ b/sdk/python/README.rst
@@ -39,11 +39,11 @@ Installing on Debian systems
 
 1. Add this Arvados repository to your sources list::
 
-     deb http://apt.arvados.org/ stretch main
+     deb http://apt.arvados.org/ buster main
 
 2. Update your package list.
 
-3. Install the ``python-arvados-python-client`` package.
+3. Install the ``python3-arvados-python-client`` package.
 
 Configuration
 -------------
diff --git a/services/dockercleaner/fpm-info.sh b/services/dockercleaner/fpm-info.sh
index d678fdfd7a..ccb7a467af 100644
--- a/services/dockercleaner/fpm-info.sh
+++ b/services/dockercleaner/fpm-info.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 case "$TARGET" in
-    debian9 | ubuntu1604)
+    ubuntu1604)
         fpm_depends+=()
         ;;
     debian* | ubuntu*)
-- 
2.30.2