From ada26ccb9bbbed663311e86f85fd941c024e7fa8 Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Sat, 28 Dec 2024 04:15:46 +0000 Subject: [PATCH 1/2] Update changelog based on model updates --- .changes/next-release/api-change-ecr-8891.json | 5 +++++ .changes/next-release/api-change-ecrpublic-37331.json | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 .changes/next-release/api-change-ecr-8891.json create mode 100644 .changes/next-release/api-change-ecrpublic-37331.json diff --git a/.changes/next-release/api-change-ecr-8891.json b/.changes/next-release/api-change-ecr-8891.json new file mode 100644 index 000000000000..630df6619691 --- /dev/null +++ b/.changes/next-release/api-change-ecr-8891.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``ecr``", + "description": "Restoring custom endpoint functionality for ECR" +} diff --git a/.changes/next-release/api-change-ecrpublic-37331.json b/.changes/next-release/api-change-ecrpublic-37331.json new file mode 100644 index 000000000000..c36115ae2667 --- /dev/null +++ b/.changes/next-release/api-change-ecrpublic-37331.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``ecr-public``", + "description": "Restoring custom endpoint functionality for ECR Public" +} From 2152afacb5ae9047d4b84228dd97a03ba6c40aea Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Sat, 28 Dec 2024 04:17:04 +0000 Subject: [PATCH 2/2] Bumping version to 1.36.31 --- .changes/1.36.31.json | 12 ++++++++++++ .changes/next-release/api-change-ecr-8891.json | 5 ----- .../next-release/api-change-ecrpublic-37331.json | 5 ----- CHANGELOG.rst | 7 +++++++ awscli/__init__.py | 2 +- doc/source/conf.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 8 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 .changes/1.36.31.json delete mode 100644 .changes/next-release/api-change-ecr-8891.json delete mode 100644 .changes/next-release/api-change-ecrpublic-37331.json diff --git a/.changes/1.36.31.json b/.changes/1.36.31.json new file mode 100644 index 000000000000..2b2057ebd861 --- /dev/null +++ b/.changes/1.36.31.json @@ -0,0 +1,12 @@ +[ + { + "category": "``ecr``", + "description": "Restoring custom endpoint functionality for ECR", + "type": "api-change" + }, + { + "category": "``ecr-public``", + "description": "Restoring custom endpoint functionality for ECR Public", + "type": "api-change" + } +] \ No newline at end of file diff --git a/.changes/next-release/api-change-ecr-8891.json b/.changes/next-release/api-change-ecr-8891.json deleted file mode 100644 index 630df6619691..000000000000 --- a/.changes/next-release/api-change-ecr-8891.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``ecr``", - "description": "Restoring custom endpoint functionality for ECR" -} diff --git a/.changes/next-release/api-change-ecrpublic-37331.json b/.changes/next-release/api-change-ecrpublic-37331.json deleted file mode 100644 index c36115ae2667..000000000000 --- a/.changes/next-release/api-change-ecrpublic-37331.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``ecr-public``", - "description": "Restoring custom endpoint functionality for ECR Public" -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 26f8edfe1b7d..f37ef04fba4c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ CHANGELOG ========= +1.36.31 +======= + +* api-change:``ecr``: Restoring custom endpoint functionality for ECR +* api-change:``ecr-public``: Restoring custom endpoint functionality for ECR Public + + 1.36.30 ======= diff --git a/awscli/__init__.py b/awscli/__init__.py index f6e84a95b143..a4cece5cc165 100644 --- a/awscli/__init__.py +++ b/awscli/__init__.py @@ -18,7 +18,7 @@ import os -__version__ = '1.36.30' +__version__ = '1.36.31' # # Get our data path to be added to botocore's search path diff --git a/doc/source/conf.py b/doc/source/conf.py index 6550800b4b25..af60496457ef 100644 --- 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.30' +release = '1.36.31' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.cfg b/setup.cfg index bc7a27caf50b..e7286a0c9488 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ universal = 0 [metadata] requires_dist = - botocore==1.35.89 + botocore==1.35.90 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 index f3db07ae9e9f..27b8540b1205 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def find_version(*file_paths): install_requires = [ - 'botocore==1.35.89', + 'botocore==1.35.90', 'docutils>=0.10,<0.17', 's3transfer>=0.10.0,<0.11.0', 'PyYAML>=3.10,<6.1',