From a036f86840d2e2a55c991321c12bd1eadd6f1bb7 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Thu, 14 Sep 2023 15:05:54 +0200 Subject: [PATCH] Improve python with pipenv to fix caching --- .github/workflows/test-smokes.yml | 4 +--- tests/run-tests.ps1 | 2 +- tests/run-tests.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-smokes.yml b/.github/workflows/test-smokes.yml index a775127520..b269ba903a 100644 --- a/.github/workflows/test-smokes.yml +++ b/.github/workflows/test-smokes.yml @@ -42,8 +42,6 @@ jobs: - os: windows-latest time-test: true runs-on: ${{ matrix.os }} - env: - QUARTO_TESTS_FORCE_NO_PIPENV: true steps: - name: Checkout Repo uses: actions/checkout@v3 @@ -131,7 +129,7 @@ jobs: working-directory: tests run: | python -m pip install pipenv - pipenv install --system + pipenv install - uses: ./.github/workflows/actions/quarto-dev diff --git a/tests/run-tests.ps1 b/tests/run-tests.ps1 index 97f3900867..9d977b89f2 100644 --- a/tests/run-tests.ps1 +++ b/tests/run-tests.ps1 @@ -137,7 +137,7 @@ $DENO_ARGS += -split $QUARTO_IMPORT_ARGMAP $DENO_ARGS += $TESTS_TO_RUN # Activate python virtualenv -# set QUARTO_TESTS_FORCE_NO_PIPENV env var to not activate the virtalenv manage by pipenv for the project +# set QUARTO_TESTS_FORCE_NO_PIPENV env var to not activate the virtualenv managed by pipenv for the project If ($null -eq $Env:QUARTO_TESTS_FORCE_NO_PIPENV) { # Save possible activated virtualenv for later restauration $OLD_VIRTUAL_ENV=$VIRTUAL_ENV diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 979f1702de..f64ddbee7e 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -33,7 +33,7 @@ then fi # Activating python virtualenv -# set QUARTO_TESTS_FORCE_NO_PIPENV env var to not activate the virtalenv manage by pipenv for the project +# set QUARTO_TESTS_FORCE_NO_PIPENV env var to not activate the virtualenv managed by pipenv for the project if [[ -z $QUARTO_TESTS_FORCE_NO_PIPENV ]] then # Save possible activated virtualenv for later restauration