From 3e2c6bb988d3819fadb15f6446fbdfee0046600d Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 15 Feb 2022 13:20:09 -0500 Subject: [PATCH] 18766: bump the Python version used by our Ubuntu 18.04 package to version 3.8. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/package-build-dockerfiles/ubuntu1804/Dockerfile | 2 +- build/run-build-packages.sh | 10 +++++++++- build/run-library.sh | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build/package-build-dockerfiles/ubuntu1804/Dockerfile b/build/package-build-dockerfiles/ubuntu1804/Dockerfile index d372784926..ed2ca49541 100644 --- a/build/package-build-dockerfiles/ubuntu1804/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu1804/Dockerfile @@ -29,7 +29,7 @@ ENV DEBIAN_FRONTEND noninteractive SHELL ["/bin/bash", "-c"] # Install dependencies. -RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev equivs +RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3.8 python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3.8-venv python3.8-dev libpam-dev equivs # Install virtualenv RUN /usr/bin/pip3 install 'virtualenv<20' diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index 0cfe54cd13..23cf81bd70 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -108,7 +108,8 @@ fi declare -a PYTHON3_BACKPORTS -PYTHON3_VERSION=$(python3 -c 'import sys; print("{v.major}.{v.minor}".format(v=sys.version_info))') +PYTHON3_EXECUTABLE=python3 +PYTHON3_VERSION=$($PYTHON3_EXECUTABLE -c 'import sys; print("{v.major}.{v.minor}".format(v=sys.version_info))') ## These defaults are suitable for any Debian-based distribution. # You can customize them as needed in distro sections below. @@ -122,6 +123,13 @@ case "$TARGET" in debian*) FORMAT=deb ;; + ubuntu1804) + FORMAT=deb + PYTHON3_EXECUTABLE=python3.8 + PYTHON3_VERSION=$($PYTHON3_EXECUTABLE -c 'import sys; print("{v.major}.{v.minor}".format(v=sys.version_info))') + PYTHON3_PACKAGE=python$PYTHON3_VERSION + PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/dist-packages + ;; ubuntu*) FORMAT=deb ;; diff --git a/build/run-library.sh b/build/run-library.sh index b0d4daa722..2a869553d1 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -787,7 +787,7 @@ fpm_build_virtualenv_worker () { ARVADOS_BUILDING_ITERATION=1 fi - local python=python3 + local python=$PYTHON3_EXECUTABLE pip=pip3 PACKAGE_PREFIX=$PYTHON3_PKG_PREFIX -- 2.30.2