Merge branch 'release-1.18.0'

* release-1.18.0:
  Bumping version to 1.18.0
  Add changelog entries from botocore
  Remove Python 2.7 support references (#2922)

Author: aws-sdk-python-automation

.changes/1.18.0.json

@@ -0,0 +1,37 @@
+[
+  {
+    "category": "``ec2``",
+    "description": "[``botocore``] This feature enables customers  to specify weekly recurring time window(s) for scheduled events that reboot, stop or terminate EC2 instances.",
+    "type": "api-change"
+  },
+  {
+    "category": "``cognito-idp``",
+    "description": "[``botocore``] Documentation updates for cognito-idp",
+    "type": "api-change"
+  },
+  {
+    "category": "``ecs``",
+    "description": "[``botocore``] Documentation updates for support of awsvpc mode on Windows.",
+    "type": "api-change"
+  },
+  {
+    "category": "``lex-models``",
+    "description": "[``botocore``] Lex now supports the en-IN locale",
+    "type": "api-change"
+  },
+  {
+    "category": "``iotsitewise``",
+    "description": "[``botocore``] Update the default endpoint for the APIs used to manage asset models, assets, gateways, tags, and account configurations. If you have firewalls with strict egress rules, configure the rules to grant you access to api.iotsitewise.[region].amazonaws.com or api.iotsitewise.[cn-region].amazonaws.com.cn.",
+    "type": "api-change"
+  },
+  {
+    "category": "Python",
+    "description": "Drop support for Python 2.7",
+    "type": "feature"
+  },
+  {
+    "category": "Python",
+    "description": "[``botocore``] Dropped support for Python 2.7",
+    "type": "feature"
+  }
+]

.github/workflows/run-tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8]
         os: [ubuntu-latest, macOS-latest, windows-latest ]
 
     steps:

CHANGELOG.rst

@@ -2,6 +2,18 @@
 CHANGELOG
 =========
 
+1.18.0
+======
+
+* api-change:``ec2``: [``botocore``] This feature enables customers  to specify weekly recurring time window(s) for scheduled events that reboot, stop or terminate EC2 instances.
+* api-change:``cognito-idp``: [``botocore``] Documentation updates for cognito-idp
+* api-change:``ecs``: [``botocore``] Documentation updates for support of awsvpc mode on Windows.
+* api-change:``lex-models``: [``botocore``] Lex now supports the en-IN locale
+* api-change:``iotsitewise``: [``botocore``] Update the default endpoint for the APIs used to manage asset models, assets, gateways, tags, and account configurations. If you have firewalls with strict egress rules, configure the rules to grant you access to api.iotsitewise.[region].amazonaws.com or api.iotsitewise.[cn-region].amazonaws.com.cn.
+* feature:Python: Drop support for Python 2.7
+* feature:Python: [``botocore``] Dropped support for Python 2.7
+
+
 1.17.112
 ========
 

README.rst

@@ -10,7 +10,7 @@ of services like Amazon S3 and Amazon EC2. You can find the latest, most
 up to date, documentation at our `doc site`_, including a list of
 services that are supported.
 
-On 01/15/2021 deprecation for Python 2.7 was announced and support will be dropped
+On 01/15/2021 deprecation for Python 2.7 was announced and support was dropped
 on 07/15/2021. To avoid disruption, customers using Boto3 on Python 2.7 may
 need to upgrade their version of Python or pin the version of Boto3. 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/>`__.

boto3/__init__.py

@@ -18,7 +18,7 @@
 
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.17.112'
+__version__ = '1.18.0'
 
 
 # The default Boto3 session; autoloaded when needed.

boto3/compat.py

@@ -64,6 +64,10 @@ def filter_python_deprecation_warnings():
 
 
 def _warn_deprecated_python():
+    """Python 2.7 is deprecated so this code will no longer run.
+
+    Use this template for future deprecation campaigns as needed.
+    """
     py_27_params = {
         'date': 'July 15, 2021',
         'blog_link': 'https://aws.amazon.com/blogs/developer/announcing-end-'

docs/source/guide/migrationpy3.rst

@@ -14,7 +14,8 @@ module) and Boto3 (which implements the API functionality and higher-level featu
 Timeline
 --------
 Going forward, all projects using Boto3 need to transition to Python 3.6 or later. Boto3 and
-Botocore support for Python 3.4 and 3.5 has already ended, and support for Python 2.7 will end effective July 15, 2021.
+Botocore ended support for Python 3.4 and 3.5 on Feb 21, 2021, and support for Python 2.7
+ended July 15, 2021.
 
 Updating your project to use Python 3
 -------------------------------------

docs/source/guide/quickstart.rst

@@ -24,10 +24,11 @@ To use Boto3, you first need to install it and its dependencies.
 Install or update Python
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Before installing Boto3, install Python 3.6 or later; support for Python 2.7 and Python 3.5 and
-earlier is deprecated. After the deprecation date listed for each Python version, new releases of
-Boto3 will not include support for that version of Python. For details, including the deprecation
-schedule and how to update your project to use Python 3.6, see :ref:`guide_migration_py3`.
+Before installing Boto3, install Python 3.6 or later; support for Python 3.5 and
+earlier is deprecated. After the deprecation date listed for each Python
+version, new releases of Boto3 will not include support for that version of
+Python. For details, including the deprecation schedule and how to update your
+project to use Python 3.6, see :ref:`guide_migration_py3`.
 
 For information about how to get the latest version of Python, see the official `Python
 documentation <https://www.python.org/downloads/>`_. 

setup.cfg

@@ -1,8 +1,8 @@
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [metadata]
 requires_dist =
-    botocore>=1.20.112,<1.21.0
+    botocore>=1.21.0,<1.22.0
     jmespath>=0.7.1,<1.0.0
-    s3transfer>=0.4.0,<0.5.0
+    s3transfer>=0.5.0,<0.6.0

setup.py

@@ -14,9 +14,9 @@
 
 
 requires = [
-    'botocore>=1.20.112,<1.21.0',
+    'botocore>=1.21.0,<1.22.0',
     'jmespath>=0.7.1,<1.0.0',
-    's3transfer>=0.4.0,<0.5.0'
+    's3transfer>=0.5.0,<0.6.0'
 ]
 
 
@@ -43,15 +43,13 @@ def get_version():
     include_package_data=True,
     install_requires=requires,
     license="Apache License 2.0",
-    python_requires=">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*",
+    python_requires=">= 3.6",
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,py37,py38
+envlist = py36,py37,py38
 
 # Comment to build sdist and install into virtualenv
 # This is helpful to test installation but takes extra time