From f8a65829adbcbc49f98d60973a4faab686188f82 Mon Sep 17 00:00:00 2001 From: kyleknap Date: Mon, 21 Mar 2022 09:36:02 -0700 Subject: [PATCH 1/2] Upgrade exe interpreter to 3.9.11 --- .changes/next-release/feature-Python-48862.json | 5 +++++ exe/assets/THIRD_PARTY_LICENSES | 2 +- exe/tests/install.bats | 2 +- tox.ini | 8 ++++---- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .changes/next-release/feature-Python-48862.json diff --git a/.changes/next-release/feature-Python-48862.json b/.changes/next-release/feature-Python-48862.json new file mode 100644 index 000000000000..54b71a3dd84b --- /dev/null +++ b/.changes/next-release/feature-Python-48862.json @@ -0,0 +1,5 @@ +{ + "type": "feature", + "category": "Python", + "description": "Upgrade embedded Python version from Python 3.8 to Python 3.9. All standalone artifacts now run on Python 3.9.11." +} diff --git a/exe/assets/THIRD_PARTY_LICENSES b/exe/assets/THIRD_PARTY_LICENSES index de2e2b0713d6..d6680435d0de 100644 --- a/exe/assets/THIRD_PARTY_LICENSES +++ b/exe/assets/THIRD_PARTY_LICENSES @@ -1263,7 +1263,7 @@ LICENSE ISSUES ------ -** Python 3.8.8; version 3.8.8 -- https://github.com/python/cpython/tree/v3.8.8 +** Python 3.9.11; version 3.9.11 -- https://github.com/python/cpython/tree/v3.9.11 Copyright © 2001-2020 Python Software Foundation. All rights reserved. PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 diff --git a/exe/tests/install.bats b/exe/tests/install.bats index 33f5e26b7a4d..71d340582659 100644 --- a/exe/tests/install.bats +++ b/exe/tests/install.bats @@ -42,7 +42,7 @@ create_exes() { } aws_version_output() { - echo "aws-cli/$1 Python/3.8.8 Darwin/17.7.0 botocore/1.12.48" + echo "aws-cli/$1 Python/3.9.11 Darwin/17.7.0 botocore/1.12.48" } run_install() { diff --git a/tox.ini b/tox.ini index 485762af80da..d5ed1f7bd4c2 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ commands = [testenv:exe] -basepython = python3.8 +basepython = python3.9 install_command = python -m pip install --no-build-isolation {opts} {packages} deps = @@ -20,7 +20,7 @@ commands = [testenv:macpkg] -basepython = python3.8 +basepython = python3.9 install_command = python -m pip install --no-build-isolation {opts} {packages} deps = @@ -30,7 +30,7 @@ commands = [testenv:test-exe] -basepython = python3.8 +basepython = python3.9 install_command = python -m pip install --no-build-isolation {opts} {packages} deps = @@ -41,6 +41,6 @@ commands = [testenv:sign-exe] -basepython = python3.8 +basepython = python3.9 commands = {envpython} {toxinidir}/scripts/installers/sign-exe {posargs} From 17f6c42a2e0aa67574b1f116bb1bf6d0ec8368c1 Mon Sep 17 00:00:00 2001 From: kyleknap Date: Tue, 22 Mar 2022 10:30:28 -0700 Subject: [PATCH 2/2] Update version of pip used to build exes This allows pip to find newer types of wheels such as universal2 macOS wheels that is used for awscrt. --- scripts/install_deps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_deps.py b/scripts/install_deps.py index baf7fc37f0cf..ee76c6e8c97a 100644 --- a/scripts/install_deps.py +++ b/scripts/install_deps.py @@ -3,7 +3,7 @@ from utils import cd, bin_path, run, virtualenv_enabled INSTALL_ARGS = "--no-build-isolation --no-cache-dir --no-index " -PINNED_PIP_VERSION = '20.0.2' +PINNED_PIP_VERSION = '22.0.4' SETUP_DEPS = ("setuptools-", "setuptools_scm", "wheel")