From 2fcfeac9415cac2ea753ec7e13baea6952281350 Mon Sep 17 00:00:00 2001 From: Amaury Chamayou Date: Wed, 16 Oct 2024 13:13:05 +0000 Subject: [PATCH] Do not call specific Python sub-version --- .azure-pipelines-templates/checks.yml | 2 +- .azure-pipelines-templates/deploy_aci.yml | 8 ++++---- .azure-pipelines-templates/install_others.yml | 2 +- .azure-pipelines-templates/release.yml | 2 +- .github/workflows/doc.yml | 2 +- .github/workflows/release.yml | 2 +- .snpcc_canary | 2 +- livehtml.sh | 2 +- python/utils/submit_recovery_share.sh | 2 +- scripts/check-cmake-format.sh | 2 +- scripts/ci-checks.sh | 4 ++-- tests/recovery_benchmark.sh | 2 +- tests/sandbox/sandbox.sh | 2 +- tests/test_install.sh | 2 +- tests/tests.sh | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.azure-pipelines-templates/checks.yml b/.azure-pipelines-templates/checks.yml index bf4096d49278..25f3c24bb8f2 100644 --- a/.azure-pipelines-templates/checks.yml +++ b/.azure-pipelines-templates/checks.yml @@ -9,5 +9,5 @@ jobs: clean: true fetchDepth: 1 - - script: python3.8 scripts/extract-release-notes.py --target-git-version + - script: python3 scripts/extract-release-notes.py --target-git-version displayName: "Check presence of release notes entry" diff --git a/.azure-pipelines-templates/deploy_aci.yml b/.azure-pipelines-templates/deploy_aci.yml index 0a7dbc3e7e0d..010d6977883f 100644 --- a/.azure-pipelines-templates/deploy_aci.yml +++ b/.azure-pipelines-templates/deploy_aci.yml @@ -55,10 +55,10 @@ jobs: - script: | set -ex az acr login --name $ACR_REGISTRY_RESOURCE_NAME - python3.8 -m venv ./scripts/azure_deployment/.env + python3 -m venv ./scripts/azure_deployment/.env source ./scripts/azure_deployment/.env/bin/activate pip install -r ./scripts/azure_deployment/requirements.txt - python3.8 scripts/azure_deployment/arm_template.py deploy aci \ + python3 scripts/azure_deployment/arm_template.py deploy aci \ --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \ --resource-group ccf-aci \ --region northeurope \ @@ -153,10 +153,10 @@ jobs: - script: | set -ex - python3.8 -m venv ./scripts/azure_deployment/.env + python3 -m venv ./scripts/azure_deployment/.env source ./scripts/azure_deployment/.env/bin/activate pip install -r ./scripts/azure_deployment/requirements.txt - python3.8 scripts/azure_deployment/arm_template.py remove aci \ + python3 scripts/azure_deployment/arm_template.py remove aci \ --subscription-id $(CCF_AZURE_SUBSCRIPTION_ID) \ --resource-group ccf-aci \ --aci-type dynamic-agent \ diff --git a/.azure-pipelines-templates/install_others.yml b/.azure-pipelines-templates/install_others.yml index bc6a540f7376..2b12161b0d31 100644 --- a/.azure-pipelines-templates/install_others.yml +++ b/.azure-pipelines-templates/install_others.yml @@ -1,7 +1,7 @@ steps: - script: | set -ex - python3.8 -m venv env + python3 -m venv env source ./env/bin/activate pip install wheel build python -m build --wheel diff --git a/.azure-pipelines-templates/release.yml b/.azure-pipelines-templates/release.yml index 8f2d3436092d..122b01fd5563 100644 --- a/.azure-pipelines-templates/release.yml +++ b/.azure-pipelines-templates/release.yml @@ -15,7 +15,7 @@ jobs: - script: | set -ex set -o pipefail - python3.8 ./scripts/extract-release-notes.py --target-git-version --append-mcr-images --describe-path-changes "./samples/constitution" | tee $(Build.BinariesDirectory)/rel-notes.md + python3 ./scripts/extract-release-notes.py --target-git-version --append-mcr-images --describe-path-changes "./samples/constitution" | tee $(Build.BinariesDirectory)/rel-notes.md displayName: Extract release notes - script: | diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index bf68f73efe52..ee268b854381 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -23,7 +23,7 @@ jobs: - name: Build Documentation run: | set -x - python3.8 -m venv env + python3 -m venv env source env/bin/activate pip install -U pip pip install -U -e ./python diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2c694921443..abe37b1bfcdb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -205,7 +205,7 @@ jobs: run: | set -ex cd python - python3.8 -m venv env + python3 -m venv env source ./env/bin/activate pip install wheel build python -m build --wheel diff --git a/.snpcc_canary b/.snpcc_canary index e9eb0ba33a62..4ee1c2fe9d6b 100644 --- a/.snpcc_canary +++ b/.snpcc_canary @@ -4,4 +4,4 @@ /-xXx--//-----x=x--/-xXx--/---x---->>>--/ ... /\/\d(-_-)b/\/\ --- \ No newline at end of file +---- \ No newline at end of file diff --git a/livehtml.sh b/livehtml.sh index 88134ce7f0bf..6a58fc0a0ead 100755 --- a/livehtml.sh +++ b/livehtml.sh @@ -14,7 +14,7 @@ fi echo "Setting up Python environment..." if [ ! -f "env/bin/activate" ] then - python3.8 -m venv env + python3 -m venv env fi source env/bin/activate diff --git a/python/utils/submit_recovery_share.sh b/python/utils/submit_recovery_share.sh index 927af0db9d39..07954bc9f284 100755 --- a/python/utils/submit_recovery_share.sh +++ b/python/utils/submit_recovery_share.sh @@ -68,7 +68,7 @@ fi if [ ! -f "env/bin/activate" ] then - python3.8 -m venv env + python3 -m venv env fi source env/bin/activate pip install -q ccf diff --git a/scripts/check-cmake-format.sh b/scripts/check-cmake-format.sh index ce82070a04a3..2bf1d0fde6ac 100755 --- a/scripts/check-cmake-format.sh +++ b/scripts/check-cmake-format.sh @@ -30,7 +30,7 @@ fi if [ ! -f "scripts/env/bin/activate" ] then - python3.8 -m venv scripts/env + python3 -m venv scripts/env fi source scripts/env/bin/activate diff --git a/scripts/ci-checks.sh b/scripts/ci-checks.sh index 677a82f782f3..b0321ae29e11 100755 --- a/scripts/ci-checks.sh +++ b/scripts/ci-checks.sh @@ -84,7 +84,7 @@ find doc/schemas/*.json -exec npx swagger-cli validate {} \; endgroup group "Copyright notice headers" -python3.8 "$SCRIPT_DIR"/notice-check.py +python3 "$SCRIPT_DIR"/notice-check.py endgroup group "CMake format" @@ -99,7 +99,7 @@ group "Python dependencies" # Virtual Environment w/ dependencies for Python steps if [ ! -f "scripts/env/bin/activate" ] then - python3.8 -m venv scripts/env + python3 -m venv scripts/env fi source scripts/env/bin/activate diff --git a/tests/recovery_benchmark.sh b/tests/recovery_benchmark.sh index d89c572b9d4e..1f67b699e561 100755 --- a/tests/recovery_benchmark.sh +++ b/tests/recovery_benchmark.sh @@ -96,7 +96,7 @@ if poll_for_service_open ${network_live_time} ${sandbox_pid}; then fi echo "** Load service" -python3.8 -m venv .recovery_bench_env +python3 -m venv .recovery_bench_env source .recovery_bench_env/bin/activate python -m pip -q install locust diff --git a/tests/sandbox/sandbox.sh b/tests/sandbox/sandbox.sh index 61a94979516e..0cff166c1ec7 100755 --- a/tests/sandbox/sandbox.sh +++ b/tests/sandbox/sandbox.sh @@ -77,7 +77,7 @@ fi if [ ! -f "${VENV_DIR}/bin/activate" ]; then echo "Setting up Python environment..." - python3.8 -m venv "${VENV_DIR}" + python3 -m venv "${VENV_DIR}" # shellcheck source=/dev/null source "${VENV_DIR}"/bin/activate diff --git a/tests/test_install.sh b/tests/test_install.sh index a49474cbf1d8..dcff76085e9c 100755 --- a/tests/test_install.sh +++ b/tests/test_install.sh @@ -51,7 +51,7 @@ if poll_for_service_open ${network_live_time}; then exit 1 fi -python3.8 -m venv env +python3 -m venv env # shellcheck source=/dev/null source env/bin/activate python -m pip install -U pip diff --git a/tests/tests.sh b/tests/tests.sh index e77dd0e27dab..6b5f09a69877 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -7,7 +7,7 @@ set -e echo "Setting up Python environment..." if [ ! -f "env/bin/activate" ] then - python3.8 -m venv env + python3 -m venv env fi source env/bin/activate