Merge branch 'release-1.18.0' into develop

* release-1.18.0:
  Bumping version to 1.18.0
  Add changelog entries from botocore

.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"
+  }
+]

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
 ========
 

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.

setup.cfg

@@ -3,6 +3,6 @@ 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'
 ]