Merge branch 'release-1.36.29' into develop

aws-sdk-python-automation · aws-sdk-python-automation · commit 42b25f06977e · 2024-12-26T19:14:12.000Z
* release-1.36.29:
  Bumping version to 1.36.29
  Update changelog based on model updates
diff --git a/.changes/1.36.29.json b/.changes/1.36.29.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``bcm-pricing-calculator``",
+    "description": "Added ConflictException to DeleteBillEstimate.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ecr``",
+    "description": "Add support for Dualstack Endpoints",
+    "type": "api-change"
+  },
+  {
+    "category": "``network-firewall``",
+    "description": "Dual-stack endpoints are now supported.",
+    "type": "api-change"
+  },
+  {
+    "category": "``securityhub``",
+    "description": "Documentation updates for AWS Security Hub",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.36.29
+=======
+
+* api-change:``bcm-pricing-calculator``: Added ConflictException to DeleteBillEstimate.
+* api-change:``ecr``: Add support for Dualstack Endpoints
+* api-change:``network-firewall``: Dual-stack endpoints are now supported.
+* api-change:``securityhub``: Documentation updates for AWS Security Hub
+
+
 1.36.28
 =======
 
diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -18,7 +18,7 @@
 
 import os
 
-__version__ = '1.36.28'
+__version__ = '1.36.29'
 
 #
 # Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.36.'
 # The full version, including alpha/beta/rc tags.
-release = '1.36.28'
+release = '1.36.29'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.35.87
+        botocore==1.35.88
         docutils>=0.10,<0.17
         s3transfer>=0.10.0,<0.11.0
         PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.35.87',
+    'botocore==1.35.88',
     'docutils>=0.10,<0.17',
     's3transfer>=0.10.0,<0.11.0',
     'PyYAML>=3.10,<6.1',

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`import os`
`20`	`20`
`21`		`-__version__ = '1.36.28'`
	`21`	`+__version__ = '1.36.29'`
`22`	`22`
`23`	`23`	`#`
`24`	`24`	`# Get our data path to be added to botocore's search path`