diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 208e81de..9ad7d003 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -154,7 +154,7 @@ jobs: python -m pip install --upgrade pip python -m pip install -r vetiver-testing/vetiver-requirements.txt python -m pip install '.[test]' - - name: Run RStudio Connect + - name: Run Posit Connect run: | docker compose up --build -d pip freeze > requirements.txt @@ -180,8 +180,8 @@ jobs: fail-fast: false matrix: PY_VERSION: - - 3.11.7 - - 3.12.1 + - 3.11.13 + - 3.12.11 steps: - uses: extractions/setup-just@v2 env: diff --git a/Makefile b/Makefile index 13050839..19ac903d 100644 --- a/Makefile +++ b/Makefile @@ -157,8 +157,7 @@ RSC_API_KEYS=vetiver-testing/rsconnect_api_keys.json dev: docker compose up -d - # Docker compose needs a little time to start up - sleep 4 + sleep 30 docker compose exec -T rsconnect bash < vetiver-testing/setup-rsconnect/add-users.sh python vetiver-testing/setup-rsconnect/dump_api_keys.py $(RSC_API_KEYS) diff --git a/docker-compose.yml b/docker-compose.yml index 5740cd9c..9f5f2d50 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.2' - services: rsconnect: diff --git a/integration-testing/docker/rstudio-connect-cli.gcfg b/integration-testing/docker/rstudio-connect-cli.gcfg index 72fbb01b..881c04dd 100644 --- a/integration-testing/docker/rstudio-connect-cli.gcfg +++ b/integration-testing/docker/rstudio-connect-cli.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.11/bin/python +Executable = /opt/python/3.11.13/bin/python [Quarto] Enabled = true diff --git a/integration-testing/docker/rstudio-connect.gcfg b/integration-testing/docker/rstudio-connect.gcfg index 4b656a7f..f7549412 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.11.7/bin/python -Executable = /opt/python/3.12.1/bin/python +Executable = /opt/python/3.11.13/bin/python +Executable = /opt/python/3.12.11/bin/python [Quarto] Enabled = true diff --git a/vetiver-testing/setup-rsconnect/rstudio-connect.gcfg b/vetiver-testing/setup-rsconnect/rstudio-connect.gcfg index 69be7f1a..bb29ecc4 100644 --- a/vetiver-testing/setup-rsconnect/rstudio-connect.gcfg +++ b/vetiver-testing/setup-rsconnect/rstudio-connect.gcfg @@ -13,8 +13,8 @@ DefaultUserRole = publisher [Python] Enabled = true -Executable = /opt/python/3.12.4/bin/python -Executable = /opt/python/3.11.9/bin/python +Executable = /opt/python/3.12.11/bin/python +Executable = /opt/python/3.11.13/bin/python [RPackageRepository "CRAN"] URL = https://p3m.dev/cran/latest