Merge pull request #688 from rstudio/dev

Upgrade Workbench for GCW to 2023.12.0 and update PPM's Python versions

.github/workflows/build-prerelease.yaml

@@ -30,7 +30,7 @@ jobs:
           - {product: "workbench", type: "preview", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
           - {product: "connect", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
           - {product: "connect-content-init", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
-          - {product: "package-manager", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
+          - {product: "package-manager", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.12.1", py-alternate: "3.11.7"}
           - {product: "r-session-complete", type: "daily", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
           - {product: "r-session-complete", type: "daily", os: 'centos7', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {product: "r-session-complete", type: "preview", os: "ubuntu2204", r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}

.github/workflows/build-release.yaml

@@ -30,6 +30,7 @@ jobs:
           - {os: 'ubuntu2204', r-primary: "4.2.0", r-alternate: "3.6.2", py-primary: "3.9.5", py-alternate: "3.8.10"}
           - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
+          - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.12.1", py-alternate: "3.11.7"}
 
     steps:
       - name: Check Out Repo - cron main
@@ -138,6 +139,7 @@ jobs:
           - {os: 'ubuntu2204', r-primary: "4.2.0", r-alternate: "3.6.2", py-primary: "3.9.5", py-alternate: "3.8.10"}
           - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
+          - {os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.12.1", py-alternate: "3.11.7"}
 
     concurrency:
       group: build-base-pro-${{ matrix.config.os }}-r${{ matrix.config.r-primary }}_${{ matrix.config.r-alternate }}-py${{ matrix.config.py-primary }}_${{ matrix.config.py-alternate }}-${{ github.ref }}
@@ -248,7 +250,7 @@ jobs:
           - {product: 'workbench', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {product: 'connect', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
           - {product: 'connect-content-init', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
-          - {product: 'package-manager', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.17", py-alternate: "3.8.17"}
+          - {product: 'package-manager', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.12.1", py-alternate: "3.11.7"}
           - {product: 'r-session-complete', os: 'centos7', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {product: 'r-session-complete', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}
           - {product: 'workbench-for-microsoft-azure-ml', os: 'ubuntu2204', r-primary: "4.2.3", r-alternate: "4.1.3", py-primary: "3.9.14", py-alternate: "3.8.15"}

package-manager/Dockerfile.ubuntu2204

@@ -1,7 +1,7 @@
 ARG R_VERSION=4.2.3
 ARG R_VERSION_ALT=4.1.3
-ARG PYTHON_VERSION=3.9.17
-ARG PYTHON_VERSION_ALT=3.8.17
+ARG PYTHON_VERSION=3.12.1
+ARG PYTHON_VERSION_ALT=3.11.7
 ARG SRC_IMAGE_NAME=product-base
 ARG REGISTRY=ghcr.io
 FROM ${REGISTRY}/rstudio/${SRC_IMAGE_NAME}:ubuntu2204-r${R_VERSION}_${R_VERSION_ALT}-py${PYTHON_VERSION}_${PYTHON_VERSION_ALT}

package-manager/Justfile

@@ -13,8 +13,8 @@ RSPM_LICENSE_SERVER := ""
 R_VERSION := "4.2.3"
 R_VERSION_ALT := "4.1.3"
 
-PYTHON_VERSION := "3.9.17"
-PYTHON_VERSION_ALT := "3.8.17"
+PYTHON_VERSION := "3.12.1"
+PYTHON_VERSION_ALT := "3.11.7"
 
 PERSIST_LICENSE := "false"
 PERSIST_LICENSE_DIR := join(justfile_directory(), "tmp-lic")

package-manager/NEWS.md

@@ -1,3 +1,6 @@
+# 2024-01-11
+- Update Python to 3.12.1
+
 # 2023-11-20
 - Add Python
 - Update R to 4.2.3
@@ -7,7 +10,7 @@
 - Removed Launcher references. Package manager no longer uses the Job Launcher for building git packages.
 
 # 2023-07-25
-- Changed `rstudio-pm.gcfg` R version number behavior from statically defined to dynamically filled on build. 
+- Changed `rstudio-pm.gcfg` R version number behavior from statically defined to dynamically filled on build.
 
 # 2022.11.4-20
 

workbench-for-google-cloud-workstations/Dockerfile.ubuntu2004

@@ -4,13 +4,13 @@ FROM us-central1-docker.pkg.dev/cloud-workstations-images/predefined/base:public
 ARG DEBIAN_FRONTEND=noninteractive
 ARG R_VERSION=4.2.3
 ARG R_VERSION_ALT=4.1.3
-ARG PYTHON_VERSION=3.10.12
-ARG PYTHON_VERSION_ALT=3.9.17
-ARG PYTHON_VERSION_JUPYTER=3.10.12
+ARG PYTHON_VERSION=3.11.7
+ARG PYTHON_VERSION_ALT=3.10.13
+ARG PYTHON_VERSION_JUPYTER=3.10.13
 ARG JUPYTERLAB_VERSION=3.6.5
-ARG QUARTO_VERSION=1.3.340
+ARG QUARTO_VERSION=1.3.450
 ARG DRIVERS_VERSION=2023.05.0
-ARG RSW_VERSION=2023.09.1+494.pro2
+ARG RSW_VERSION=2023.12.0+369.pro3
 ARG RSW_NAME=rstudio-workbench
 ARG RSW_DOWNLOAD_URL=https://download2.rstudio.org/server/focal/amd64