From e2f780c7ab40cbe79ee8ffc3490a05b8c067dbfd Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Mon, 3 Jun 2024 09:25:34 -0400 Subject: [PATCH 1/4] update quarto and python --- integration-testing/docker/rstudio-connect-cli.gcfg | 6 +++--- integration-testing/docker/rstudio-connect.gcfg | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/integration-testing/docker/rstudio-connect-cli.gcfg b/integration-testing/docker/rstudio-connect-cli.gcfg index 54857433..b4224b53 100644 --- a/integration-testing/docker/rstudio-connect-cli.gcfg +++ b/integration-testing/docker/rstudio-connect-cli.gcfg @@ -15,12 +15,12 @@ NoWarning = true [Python] Enabled = true -Executable = /opt/python/3.8.17/bin/python -Executable = /opt/python/3.9.17/bin/python +Executable = /opt/python/3.12.1/bin/python +Executable = /opt/python/3.11.7/bin/python [Quarto] Enabled = true -Executable = /opt/quarto/bin/quarto +Executable = /opt/quarto/1.4.552/bin/quarto [Authentication] BasicAuth = true diff --git a/integration-testing/docker/rstudio-connect.gcfg b/integration-testing/docker/rstudio-connect.gcfg index e1550d09..b4224b53 100644 --- a/integration-testing/docker/rstudio-connect.gcfg +++ b/integration-testing/docker/rstudio-connect.gcfg @@ -15,12 +15,12 @@ NoWarning = true [Python] Enabled = true -Executable = /opt/python/3.8.17/bin/python -Executable = /opt/python/3.9.17/bin/python +Executable = /opt/python/3.12.1/bin/python +Executable = /opt/python/3.11.7/bin/python [Quarto] Enabled = true -Executable = /usr/local/bin/quarto +Executable = /opt/quarto/1.4.552/bin/quarto [Authentication] BasicAuth = true @@ -34,4 +34,4 @@ DefaultUserRole = "publisher" SeedUsers = true [Mount] -BaseDir = /connect-rsconnect-mount \ No newline at end of file +BaseDir = /connect-rsconnect-mount From 0f66f480b8af094f88fc912cde12e28de7611bb5 Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Mon, 3 Jun 2024 09:38:17 -0400 Subject: [PATCH 2/4] update python --- .github/workflows/deploy_tests.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy_tests.yml b/.github/workflows/deploy_tests.yml index 132cbc50..6d6f7b3a 100644 --- a/.github/workflows/deploy_tests.yml +++ b/.github/workflows/deploy_tests.yml @@ -33,8 +33,8 @@ jobs: fail-fast: false matrix: PY_VERSION: - - 3.8.10 - - 3.9.5 + - 3.11.7 + - 3.12.1 steps: - uses: extractions/setup-just@v2 env: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eef8d5c1..3a54d33a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -258,8 +258,8 @@ jobs: fail-fast: false matrix: PY_VERSION: - - 3.8.10 - - 3.9.5 + - 3.11.7 + - 3.12.1 steps: - uses: extractions/setup-just@v2 env: From 8c57602bb083b84ec48808a04ea91672794134f1 Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Mon, 3 Jun 2024 10:31:15 -0400 Subject: [PATCH 3/4] delete dotnet and fix python for jupyter --- .github/workflows/deploy_tests.yml | 3 +++ .github/workflows/main.yml | 3 +++ integration-testing/docker/rstudio-connect.gcfg | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_tests.yml b/.github/workflows/deploy_tests.yml index 6d6f7b3a..f8c06c30 100644 --- a/.github/workflows/deploy_tests.yml +++ b/.github/workflows/deploy_tests.yml @@ -44,6 +44,9 @@ jobs: fetch-depth: 0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Delete dotnet to save space + run: sudo rm -rf /usr/share/dotnet - uses: actions/checkout@v4 with: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a54d33a..dce79893 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -280,6 +280,9 @@ jobs: examples sparse-checkout-cone-mode: false token: ${{ secrets.CONNECT_PAT }} + + - name: Delete dotnet to save space + run: sudo rm -rf /usr/share/dotnet - name: Build docker container-image run: | diff --git a/integration-testing/docker/rstudio-connect.gcfg b/integration-testing/docker/rstudio-connect.gcfg index b4224b53..038800fe 100644 --- a/integration-testing/docker/rstudio-connect.gcfg +++ b/integration-testing/docker/rstudio-connect.gcfg @@ -15,8 +15,8 @@ NoWarning = true [Python] Enabled = true -Executable = /opt/python/3.12.1/bin/python Executable = /opt/python/3.11.7/bin/python +Executable = /opt/python/3.12.1/bin/python [Quarto] Enabled = true @@ -34,4 +34,4 @@ DefaultUserRole = "publisher" SeedUsers = true [Mount] -BaseDir = /connect-rsconnect-mount +BaseDir = /connect-rsconnect-mount \ No newline at end of file From 92755cff70e41c20515feff40f55028c4a3adc66 Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Mon, 3 Jun 2024 10:53:01 -0400 Subject: [PATCH 4/4] update jupyter env python too --- integration-testing/docker/client.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-testing/docker/client.Dockerfile b/integration-testing/docker/client.Dockerfile index 2986a095..71a81125 100644 --- a/integration-testing/docker/client.Dockerfile +++ b/integration-testing/docker/client.Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9 +FROM python:3.12 COPY ./requirements.txt . EXPOSE 9999 VOLUME ../../:/rsconnect-python/