Merge branch 'release-1.32.0'

* release-1.32.0: Bumping version to 1.32.0 Add changelog entries from botocore Update changelog based on model updates Add changelog for Python 3.7 End of Support Deprecate Python 3.7 Support
aws · Dec 13, 2023 · 59cf8d6 · 59cf8d6
2 parents 0faea3a + c93a086
commit 59cf8d6
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 39 deletions.
diff --git a/.changes/1.32.0.json b/.changes/1.32.0.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "Python",
+    "description": "End of support for Python 3.7",
+    "type": "feature"
+  },
+  {
+    "category": "``drs``",
+    "description": "Adding AgentVersion to SourceServer and RecoveryInstance structures",
+    "type": "api-change"
+  },
+  {
+    "category": "Python",
+    "description": "End of support for Python 3.7",
+    "type": "feature"
+  }
+]
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.32.0
+======
+
+* feature:Python: End of support for Python 3.7
+* api-change:``drs``: Adding AgentVersion to SourceServer and RecoveryInstance structures
+* feature:Python: End of support for Python 3.7
+
+
 1.31.13
 =======
 

diff --git a/README.rst b/README.rst
@@ -26,7 +26,6 @@ Requirements
 
 The aws-cli package works on Python versions:
 
--  3.7.x and greater
 -  3.8.x and greater
 -  3.9.x and greater
 -  3.10.x and greater
@@ -36,14 +35,13 @@ The aws-cli package works on Python versions:
 Notices
 ~~~~~~~
 
-On 2021-01-15, deprecation for Python 2.7 was announced and support was dropped
-on 2021-07-15. To avoid disruption, customers using the AWS CLI on Python 2.7 may
-need to upgrade their version of Python or pin the version of the AWS CLI. For
-more information, see this `blog post <https://aws.amazon.com/blogs/developer/announcing-end-of-support-for-python-2-7-in-aws-sdk-for-python-and-aws-cli-v1/>`__.
-
 On 2022-05-30, support for Python 3.6 was ended. This follows the
 Python Software Foundation `end of support <https://www.python.org/dev/peps/pep-0494/#lifespan>`__
 for the runtime which occurred on 2021-12-23.
+
+On 2023-12-13, support for Python 3.7 was ended. This follows the
+Python Software Foundation `end of support <https://www.python.org/dev/peps/pep-0537/#lifespan>`__
+for the runtime which occurred on 2023-06-27.
 For more information, see this `blog post <https://aws.amazon.com/blogs/developer/python-support-policy-updates-for-aws-sdks-and-tools/>`__.
 
 *Attention!*

diff --git a/UPGRADE_PY3.md b/UPGRADE_PY3.md
@@ -15,14 +15,15 @@ v1. You can upgrade to the AWS CLI v2 to avoid these deprecations in the future.
 ----
 ## Timeline
 
-Going forward, customers using the CLI v1 should transition to using Python 3, with Python 3.7 becoming
+Going forward, customers using the CLI v1 should transition to using Python 3, with Python 3.8 becoming
 the minimum by the end of the transition. The deprecation dates for the affected versions of Python are:
 
 |Python version|Deprecation date|
 |--------------|----------------|
 | Python 2.7|          7/15/2021|
 | Python 3.4 and 3.5|   2/1/2021|
 | Python 3.6|          5/30/2022|
+| Python 3.7|         12/13/2023|
 
 ## Impact on the AWS CLI
 
@@ -48,7 +49,7 @@ $ aws --version
 aws-cli/1.18.191 Python/2.7.18 Darwin/19.6.0 botocore/1.19.31
 ```
 
-If the second portion of the version string, starting with **Python/** isn’t Python/3.7.x
+If the second portion of the version string, starting with **Python/** isn’t Python/3.8.x
 or higher, you should review the options below.
 
 ### Installing CLI with Python 3
@@ -61,7 +62,7 @@ Otherwise, upgrading Python versions isn’t difficult.
 
 1. To begin, uninstall your existing copy of the AWS CLI. You can find instructions in the 
 [CLI v1 installation guide](https://docs.aws.amazon.com/cli/latest/userguide/install-linux.html).
-2. Now we’ll install Python 3.7 or later. You can get Python from
+2. Now we’ll install Python 3.8 or later. You can get Python from
 [Python.org](https://www.python.org/downloads) or using your local package manager. 
 In this example, we’ll use a recent version, Python 3.8.7, to ensure the longest support window. 
 3. Next, depending on your installation method, the new Python installation should be available at 
@@ -88,7 +89,7 @@ $ python awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
 7. If you wish, you may verify that the newly installed copy of the AWS CLI tool, **aws**, is 
 using the correct version of Python. The **aws --version** command reports the **aws** tool's 
 version number, followed by the version of Python it's running under, then the operating system 
-version and the version of botocore. As long as the Python version is at least 3.7,
+version and the version of botocore. As long as the Python version is at least 3.8,
 you're ready to go:
 ```bash
     $ aws --version

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.31.13'
+__version__ = '1.32.0'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -50,9 +50,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.31.'
+version = '1.32'
 # The full version, including alpha/beta/rc tags.
-release = '1.31.13'
+release = '1.32.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/requirements-dev-lock.txt b/requirements-dev-lock.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.7
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file=requirements-dev-lock.txt requirements-dev.txt
 #
@@ -79,12 +79,6 @@ exceptiongroup==1.1.3 \
     --hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \
     --hash=sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3
     # via pytest
-importlib-metadata==4.12.0 \
-    --hash=sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670 \
-    --hash=sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23
-    # via
-    #   pluggy
-    #   pytest
 iniconfig==1.1.1 \
     --hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
     --hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
@@ -117,15 +111,7 @@ tomli==2.0.1 \
     # via
     #   coverage
     #   pytest
-typing-extensions==4.3.0 \
-    --hash=sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02 \
-    --hash=sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6
-    # via importlib-metadata
 wheel==0.38.1 \
     --hash=sha256:7a95f9a8dc0924ef318bd55b616112c70903192f524d120acc614f59547a9e1f \
     --hash=sha256:ea041edf63f4ccba53ad6e035427997b3bb10ee88a4cd014ae82aeb9eea77bb9
     # via -r requirements-dev.txt
-zipp==3.8.0 \
-    --hash=sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad \
-    --hash=sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099
-    # via importlib-metadata
diff --git a/scripts/install b/scripts/install
@@ -27,6 +27,7 @@ UNSUPPORTED_PYTHON = (
     (3,4),
     (3,5),
     (3,6),
+    (3,7),
 )
 INSTALL_ARGS = (
     '--no-binary :all: --no-build-isolation --no-cache-dir --no-index '
@@ -207,7 +208,7 @@ def main():
     if py_version in UNSUPPORTED_PYTHON:
         unsupported_python_msg = (
             "Unsupported Python version detected: Python {}.{}\n"
-            "To continue using this installer you must use Python 3.7 "
+            "To continue using this installer you must use Python 3.8 "
             "or later.\n"
             "For more information see the following blog post: "
             "https://aws.amazon.com/blogs/developer/announcing-end-"
@@ -223,7 +224,7 @@ def main():
             "Deprecated Python version detected: Python {}.{}\n"
             "Starting {}, the AWS CLI will no longer support "
             "this version of Python. To continue receiving service updates, "
-            "bug fixes, and security updates please upgrade to Python 3.7 or "
+            "bug fixes, and security updates please upgrade to Python 3.8 or "
             "later. More information can be found here: {}"
         ).format(
             py_version[0], py_version[1], params['date'], params['blog_link']

diff --git a/setup.cfg b/setup.cfg
@@ -3,9 +3,9 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.33.13
+        botocore==1.34.0
         docutils>=0.10,<0.17
-        s3transfer>=0.8.0,<0.9.0
+        s3transfer>=0.9.0,<0.10.0
         PyYAML>=3.10,<6.1
         colorama>=0.2.5,<0.4.5
         rsa>=3.1.2,<4.8

diff --git a/setup.py b/setup.py
@@ -24,9 +24,9 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.33.13',
+    'botocore==1.34.0',
     'docutils>=0.10,<0.17',
-    's3transfer>=0.8.0,<0.9.0',
+    's3transfer>=0.9.0,<0.10.0',
     'PyYAML>=3.10,<6.1',
     'colorama>=0.2.5,<0.4.5',
     'rsa>=3.1.2,<4.8',
@@ -48,7 +48,7 @@ def find_version(*file_paths):
     install_requires=install_requires,
     extras_require={},
     license="Apache License 2.0",
-    python_requires=">= 3.7",
+    python_requires=">= 3.8",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -58,7 +58,6 @@ def find_version(*file_paths):
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py37,py38,py39,py310,py311,py312
+envlist = py38,py39,py310,py311,py312
 
 skipsdist = True