Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to generic Python3 executable #6575

Merged
merged 2 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines-templates/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions .azure-pipelines-templates/deploy_aci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines-templates/install_others.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines-templates/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .snpcc_canary
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
/-xXx--//-----x=x--/-xXx--/---x---->>>--/
...
/\/\d(-_-)b/\/\
--/\
----
2 changes: 1 addition & 1 deletion livehtml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/utils/submit_recovery_share.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-cmake-format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/recovery_benchmark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/sandbox/sandbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down