From 4383c567ac32b79a7902cc953d03543803e87ad0 Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation <github-aws-sdk-python-automation@amazon.com>
Date: Wed, 29 Jan 2025 19:40:42 +0000
Subject: [PATCH 1/2] Add changelog entries from botocore
---
.../next-release/api-change-bcmpricingcalculator-79457.json | 5 +++++
.changes/next-release/api-change-ecr-97373.json | 5 +++++
.changes/next-release/api-change-ecrpublic-81292.json | 5 +++++
.changes/next-release/api-change-mailmanager-69862.json | 5 +++++
.changes/next-release/api-change-s3-25049.json | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 .changes/next-release/api-change-bcmpricingcalculator-79457.json
create mode 100644 .changes/next-release/api-change-ecr-97373.json
create mode 100644 .changes/next-release/api-change-ecrpublic-81292.json
create mode 100644 .changes/next-release/api-change-mailmanager-69862.json
create mode 100644 .changes/next-release/api-change-s3-25049.json
diff --git a/.changes/next-release/api-change-bcmpricingcalculator-79457.json b/.changes/next-release/api-change-bcmpricingcalculator-79457.json
new file mode 100644
index 0000000000..a87aa88f84
--- /dev/null
+++ b/.changes/next-release/api-change-bcmpricingcalculator-79457.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``bcm-pricing-calculator``",
+ "description": "[``botocore``] Added ConflictException error type in DeleteBillScenario, BatchDeleteBillScenarioCommitmentModification, BatchDeleteBillScenarioUsageModification, BatchUpdateBillScenarioUsageModification, and BatchUpdateBillScenarioCommitmentModification API operations."
+}
diff --git a/.changes/next-release/api-change-ecr-97373.json b/.changes/next-release/api-change-ecr-97373.json
new file mode 100644
index 0000000000..e9906d485a
--- /dev/null
+++ b/.changes/next-release/api-change-ecr-97373.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ecr``",
+ "description": "[``botocore``] Add support for Dualstack and Dualstack-with-FIPS Endpoints"
+}
diff --git a/.changes/next-release/api-change-ecrpublic-81292.json b/.changes/next-release/api-change-ecrpublic-81292.json
new file mode 100644
index 0000000000..76cd567737
--- /dev/null
+++ b/.changes/next-release/api-change-ecrpublic-81292.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``ecr-public``",
+ "description": "[``botocore``] Add support for Dualstack Endpoints"
+}
diff --git a/.changes/next-release/api-change-mailmanager-69862.json b/.changes/next-release/api-change-mailmanager-69862.json
new file mode 100644
index 0000000000..082f9574dd
--- /dev/null
+++ b/.changes/next-release/api-change-mailmanager-69862.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``mailmanager``",
+ "description": "[``botocore``] This release includes a new feature for Amazon SES Mail Manager which allows customers to specify known addresses and domains and make use of those in traffic policies and rules actions to distinguish between known and unknown entries."
+}
diff --git a/.changes/next-release/api-change-s3-25049.json b/.changes/next-release/api-change-s3-25049.json
new file mode 100644
index 0000000000..1ee34a4184
--- /dev/null
+++ b/.changes/next-release/api-change-s3-25049.json
@@ -0,0 +1,5 @@
+{
+ "type": "api-change",
+ "category": "``s3``",
+ "description": "[``botocore``] Change the type of MpuObjectSize in CompleteMultipartUploadRequest from int to long."
+}
From 76e90594231b03177da14a300471ad4cc2fb077c Mon Sep 17 00:00:00 2001
From: aws-sdk-python-automation <github-aws-sdk-python-automation@amazon.com>
Date: Wed, 29 Jan 2025 19:41:07 +0000
Subject: [PATCH 2/2] Bumping version to 1.36.9
---
.changes/1.36.9.json | 27 +++++++++++++++++++
...api-change-bcmpricingcalculator-79457.json | 5 ----
.../next-release/api-change-ecr-97373.json | 5 ----
.../api-change-ecrpublic-81292.json | 5 ----
.../api-change-mailmanager-69862.json | 5 ----
.../next-release/api-change-s3-25049.json | 5 ----
CHANGELOG.rst | 10 +++++++
boto3/__init__.py | 2 +-
setup.cfg | 2 +-
setup.py | 2 +-
10 files changed, 40 insertions(+), 28 deletions(-)
create mode 100644 .changes/1.36.9.json
delete mode 100644 .changes/next-release/api-change-bcmpricingcalculator-79457.json
delete mode 100644 .changes/next-release/api-change-ecr-97373.json
delete mode 100644 .changes/next-release/api-change-ecrpublic-81292.json
delete mode 100644 .changes/next-release/api-change-mailmanager-69862.json
delete mode 100644 .changes/next-release/api-change-s3-25049.json
diff --git a/.changes/1.36.9.json b/.changes/1.36.9.json
new file mode 100644
index 0000000000..31834be7a5
--- /dev/null
+++ b/.changes/1.36.9.json
@@ -0,0 +1,27 @@
+[
+ {
+ "category": "``bcm-pricing-calculator``",
+ "description": "[``botocore``] Added ConflictException error type in DeleteBillScenario, BatchDeleteBillScenarioCommitmentModification, BatchDeleteBillScenarioUsageModification, BatchUpdateBillScenarioUsageModification, and BatchUpdateBillScenarioCommitmentModification API operations.",
+ "type": "api-change"
+ },
+ {
+ "category": "``ecr``",
+ "description": "[``botocore``] Add support for Dualstack and Dualstack-with-FIPS Endpoints",
+ "type": "api-change"
+ },
+ {
+ "category": "``ecr-public``",
+ "description": "[``botocore``] Add support for Dualstack Endpoints",
+ "type": "api-change"
+ },
+ {
+ "category": "``mailmanager``",
+ "description": "[``botocore``] This release includes a new feature for Amazon SES Mail Manager which allows customers to specify known addresses and domains and make use of those in traffic policies and rules actions to distinguish between known and unknown entries.",
+ "type": "api-change"
+ },
+ {
+ "category": "``s3``",
+ "description": "[``botocore``] Change the type of MpuObjectSize in CompleteMultipartUploadRequest from int to long.",
+ "type": "api-change"
+ }
+]
\ No newline at end of file
diff --git a/.changes/next-release/api-change-bcmpricingcalculator-79457.json b/.changes/next-release/api-change-bcmpricingcalculator-79457.json
deleted file mode 100644
index a87aa88f84..0000000000
--- a/.changes/next-release/api-change-bcmpricingcalculator-79457.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``bcm-pricing-calculator``",
- "description": "[``botocore``] Added ConflictException error type in DeleteBillScenario, BatchDeleteBillScenarioCommitmentModification, BatchDeleteBillScenarioUsageModification, BatchUpdateBillScenarioUsageModification, and BatchUpdateBillScenarioCommitmentModification API operations."
-}
diff --git a/.changes/next-release/api-change-ecr-97373.json b/.changes/next-release/api-change-ecr-97373.json
deleted file mode 100644
index e9906d485a..0000000000
--- a/.changes/next-release/api-change-ecr-97373.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ecr``",
- "description": "[``botocore``] Add support for Dualstack and Dualstack-with-FIPS Endpoints"
-}
diff --git a/.changes/next-release/api-change-ecrpublic-81292.json b/.changes/next-release/api-change-ecrpublic-81292.json
deleted file mode 100644
index 76cd567737..0000000000
--- a/.changes/next-release/api-change-ecrpublic-81292.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``ecr-public``",
- "description": "[``botocore``] Add support for Dualstack Endpoints"
-}
diff --git a/.changes/next-release/api-change-mailmanager-69862.json b/.changes/next-release/api-change-mailmanager-69862.json
deleted file mode 100644
index 082f9574dd..0000000000
--- a/.changes/next-release/api-change-mailmanager-69862.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``mailmanager``",
- "description": "[``botocore``] This release includes a new feature for Amazon SES Mail Manager which allows customers to specify known addresses and domains and make use of those in traffic policies and rules actions to distinguish between known and unknown entries."
-}
diff --git a/.changes/next-release/api-change-s3-25049.json b/.changes/next-release/api-change-s3-25049.json
deleted file mode 100644
index 1ee34a4184..0000000000
--- a/.changes/next-release/api-change-s3-25049.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "type": "api-change",
- "category": "``s3``",
- "description": "[``botocore``] Change the type of MpuObjectSize in CompleteMultipartUploadRequest from int to long."
-}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b33355b7e6..d0242228ba 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
CHANGELOG
=========
+1.36.9
+======
+
+* api-change:``bcm-pricing-calculator``: [``botocore``] Added ConflictException error type in DeleteBillScenario, BatchDeleteBillScenarioCommitmentModification, BatchDeleteBillScenarioUsageModification, BatchUpdateBillScenarioUsageModification, and BatchUpdateBillScenarioCommitmentModification API operations.
+* api-change:``ecr``: [``botocore``] Add support for Dualstack and Dualstack-with-FIPS Endpoints
+* api-change:``ecr-public``: [``botocore``] Add support for Dualstack Endpoints
+* api-change:``mailmanager``: [``botocore``] This release includes a new feature for Amazon SES Mail Manager which allows customers to specify known addresses and domains and make use of those in traffic policies and rules actions to distinguish between known and unknown entries.
+* api-change:``s3``: [``botocore``] Change the type of MpuObjectSize in CompleteMultipartUploadRequest from int to long.
+
+
1.36.8
======
diff --git a/boto3/__init__.py b/boto3/__init__.py
index 5cf6460a5c..8c0d90673e 100644
--- a/boto3/__init__.py
+++ b/boto3/__init__.py
@@ -17,7 +17,7 @@
from boto3.session import Session
__author__ = 'Amazon Web Services'
-__version__ = '1.36.8'
+__version__ = '1.36.9'
# The default Boto3 session; autoloaded when needed.
diff --git a/setup.cfg b/setup.cfg
index 7435e55dc9..3c87c599cc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
[metadata]
requires_dist =
- botocore>=1.36.8,<1.37.0
+ botocore>=1.36.9,<1.37.0
jmespath>=0.7.1,<2.0.0
s3transfer>=0.11.0,<0.12.0
diff --git a/setup.py b/setup.py
index 16d199ce72..ebc659bb3d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
requires = [
- 'botocore>=1.36.8,<1.37.0',
+ 'botocore>=1.36.9,<1.37.0',
'jmespath>=0.7.1,<2.0.0',
's3transfer>=0.11.0,<0.12.0',
]