Skip to content

Commit

Permalink
Revert quarto version upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
dbkegley committed Apr 10, 2024
1 parent 73939c2 commit 9135318
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PYTHON_VERSION_ALT := "3.8.17"
PYTHON_VERSION_RHEL := "3.9.14"
PYTHON_VERSION_ALT_RHEL := "3.8.15"

QUARTO_VERSION := "1.4.552"
QUARTO_VERSION := "1.3.450"

# just _get-tag-safe-version 2022.07.2+576.pro12
_get-tag-safe-version $VERSION:
Expand Down
2 changes: 1 addition & 1 deletion ci.Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PYTHON_VERSION_ALT := "3.8.17"
DRIVERS_VERSION := "2024.03.0"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"

QUARTO_VERSION := "1.4.552"
QUARTO_VERSION := "1.3.340"

# just _get-os-alias jammy
_get-os-alias OS:
Expand Down
7 changes: 2 additions & 5 deletions connect/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
# 2024-03-28
- Updated to Quarto 1.4.552.

# 2023-08-01
- BREAKING: Removed R 3.6.2, replaced with R 4.1.3.
- Updated R 4.2.0 to 4.2.3.
- Updated Python versions to 3.8.17 and 3.9.17 (latest fix versions).

# 2023-07-25
- Changed `rstudio-connect.gcfg` Python version numbers behavior from statically defined to dynamically filled on build.
- Changed `rstudio-connect.gcfg` Python version numbers behavior from statically defined to dynamically filled on build.

# 2023-07-10

- BREAKING: Deprecate the Ubuntu 18.04 (Bionic Beaver) images.

# 2023-07-07

- WARNING: Refactor image to build _FROM_ the new `product-base` image, this could be potentially breaking for some
- WARNING: Refactor image to build _FROM_ the new `product-base` image, this could be potentially breaking for some
users.
- The following packages have been removed from the image: `gdebi-core`, `libsm6`, `libxext6`, and `libxrender1`.
- The [Posit Professional Drivers](https://docs.posit.co/pro-drivers/) are now included by default in the image.
Expand Down
2 changes: 1 addition & 1 deletion connect/rstudio-connect.gcfg
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Executable = /opt/python/{{PYTHON_VERSION_ALT}}/bin/python

[Quarto]
Enabled = true
Executable = /opt/quarto/1.4.552/bin/quarto
Executable = /opt/quarto/1.3.340/bin/quarto

[RPackageRepository "CRAN"]
URL = https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
Expand Down
2 changes: 1 addition & 1 deletion product/base/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG R_VERSION_ALT=3.6.2
ARG PYTHON_VERSION=3.9.14
ARG PYTHON_VERSION_ALT=3.8.15
ARG TINI_VERSION=0.19.0
ARG QUARTO_VERSION=1.4.552
ARG QUARTO_VERSION=1.3.340

### Update/upgrade system packages ###
RUN yum upgrade -y -q \
Expand Down
2 changes: 1 addition & 1 deletion product/base/Dockerfile.ubuntu2204
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG R_VERSION_ALT=4.1.3
ARG PYTHON_VERSION=3.9.17
ARG PYTHON_VERSION_ALT=3.8.17
ARG TINI_VERSION=0.19.0
ARG QUARTO_VERSION=1.4.552
ARG QUARTO_VERSION=1.3.340

### Update/upgrade system packages ###
RUN apt-get update --fix-missing \
Expand Down
2 changes: 1 addition & 1 deletion product/base/Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PYTHON_VERSION := "3.9.17"
PYTHON_VERSION_ALT := "3.8.17"

TINI_VERSION := "0.19.0"
QUARTO_VERSION := "1.4.552"
QUARTO_VERSION := "1.3.340"

_make-default-tag OS=IMAGE_OS:
echo "{{IMAGE_REGISTRY}}/{{PRODUCT}}:{{OS}}-r{{R_VERSION}}_{{R_VERSION_ALT}}-py{{PYTHON_VERSION}}_{{PYTHON_VERSION_ALT}}"
Expand Down
2 changes: 1 addition & 1 deletion product/pro/Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PYTHON_VERSION := "3.9.17"
PYTHON_VERSION_ALT := "3.8.17"

TINI_VERSION := "0.19.0"
QUARTO_VERSION := "1.4.552"
QUARTO_VERSION := "1.3.340"

DRIVERS_VERSION := "2024.03.0"
DRIVERS_VERSION_RHEL := DRIVERS_VERSION + "-1"
Expand Down
2 changes: 1 addition & 1 deletion workbench-for-google-cloud-workstations/.env
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ PYTHON_VERSION_JUPYTER=3.10.13
R_VERSION=4.2.3
R_VERSION_ALT=4.1.3
DRIVERS_VERSION=2023.05.0
QUARTO_VERSION=1.4.552
QUARTO_VERSION=1.3.340
IMAGE_REGISTRY_NAME=us-central1-docker.pkg.dev/posit-images/cloud-workstations/workbench
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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.4.552
ARG QUARTO_VERSION=1.3.340
ARG DRIVERS_VERSION=2023.05.0
ARG RSW_VERSION=2023.12.1+402.pro1
ARG RSW_NAME=rstudio-workbench
Expand Down

0 comments on commit 9135318

Please sign in to comment.