[ARVADOS] created: 2.1.0-67-gbfdad6291

[Git user]

        at  bfdad62911cdaa7c6d02438ec76a9dd4c784d6b7 (commit)


commit bfdad62911cdaa7c6d02438ec76a9dd4c784d6b7
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Tue Oct 27 10:13:53 2020 -0300

    feat(centos): use centos-provided python3
    
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index 5d204464c..06eb77eee 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -40,8 +40,7 @@ RUN ln -s /usr/local/node-v6.11.2-linux-x64/bin/* /usr/local/bin/
 
 # Need to "touch" RPM database to workaround bug in interaction between
 # overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
-RUN touch /var/lib/rpm/* && yum -q -y install rh-python36
-RUN scl enable rh-python36 "easy_install-3.6 pip"
+RUN touch /var/lib/rpm/* && yum -q -y install python3 python3-pip
 
 # Add epel, we need it for the python-pam dependency
 #RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
@@ -50,7 +49,7 @@ RUN scl enable rh-python36 "easy_install-3.6 pip"
 RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && cd /tmp/arvados/services/api && /usr/local/rvm/bin/rvm-exec default bundle && cd /tmp/arvados/apps/workbench && /usr/local/rvm/bin/rvm-exec default bundle
 
 # The version of setuptools that comes with CentOS is way too old
-RUN scl enable rh-python36 "easy_install-3.6 pip install 'setuptools<45'"
+RUN pip3 install 'setuptools<45'
 
 ENV WORKSPACE /arvados
-CMD ["scl", "enable", "rh-python36", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"]
+CMD ["/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos7"]
diff --git a/build/package-testing/test-package-rh-python36-python-arvados-python-client.sh b/build/package-testing/test-package-rh-python36-python-arvados-python-client.sh
index 1a6925656..914974d08 100755
--- a/build/package-testing/test-package-rh-python36-python-arvados-python-client.sh
+++ b/build/package-testing/test-package-rh-python36-python-arvados-python-client.sh
@@ -7,7 +7,7 @@ set -e
 
 arv-put --version
 
-/usr/share/python3/dist/rh-python36-python-arvados-python-client/bin/python3 << EOF
+/usr/bin/python3 << EOF
 import arvados
 print("Successfully imported arvados")
 EOF
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index d0a79ad3d..300354df5 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -217,16 +217,7 @@ if test -z "$packages" ; then
         keep-block-check
         keep-web
         libarvados-perl
-        libpam-arvados-go"
-    if [[ "$TARGET" =~ "centos" ]]; then
-      packages="$packages
-        rh-python36-python-cwltest
-        rh-python36-python-arvados-fuse
-        rh-python36-python-arvados-python-client
-        rh-python36-python-arvados-cwl-runner
-        rh-python36-python-crunchstat-summary"
-    else
-      packages="$packages
+        libpam-arvados-go
         python3-cwltest
         python3-arvados-fuse
         python3-arvados-python-client
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 0e74ac6f2..0a83edfdf 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -123,10 +123,10 @@ case "$TARGET" in
         ;;
     centos*)
         FORMAT=rpm
-        PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
-        PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
-        PYTHON3_PREFIX=/opt/rh/rh-python36/root/usr
-        PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/site-packages
+        # PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
+        # PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
+        # PYTHON3_PREFIX=/opt/rh/rh-python36/root/usr
+        # PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/site-packages
         export PYCURL_SSL_LIBRARY=nss
         ;;
     *)
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index d0a29f598..5ea39369f 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -232,9 +232,9 @@ h2(#v1_4_1). v1.4.1 (2019-09-20)
 
 "Upgrading from 1.4.0":#v1_4_0
 
-h3. Centos7 Python 3 dependency upgraded to rh-python36
+h3. Centos7 Python 3 dependency upgraded to python3
 
-The Python 3 dependency for Centos7 Arvados packages was upgraded from rh-python35 to rh-python36.
+The Python 3 dependency for Centos7 Arvados packages was upgraded from rh-python35 to python3.
 
 h2(#v1_4_0). v1.4.0 (2019-06-05)
 

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


hooks/post-receive
--