Skip to content

Commit

Permalink
Merge branch 'release-1.33.4'
Browse files Browse the repository at this point in the history
* release-1.33.4:
  Bumping version to 1.33.4
  Add changelog entries from botocore
  Raise s3transfer floor to 0.8.2 (#3960)
  Add additonal tests (#3958)
  • Loading branch information
aws-sdk-python-automation committed Nov 30, 2023
2 parents 3f84dbb + fde9bf2 commit b393ee1
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 7 deletions.
32 changes: 32 additions & 0 deletions .changes/1.33.4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[
{
"category": "``s3transfer``",
"description": "Raise floor for ``s3transfer`` to 0.8.2 to avoid any conflicts with the awscrt",
"type": "bugfix"
},
{
"category": "``marketplace-agreement``",
"description": "[``botocore``] The AWS Marketplace Agreement Service provides an API interface that helps AWS Marketplace sellers manage their agreements, including listing, filtering, and viewing details about their agreements.",
"type": "api-change"
},
{
"category": "``marketplace-catalog``",
"description": "[``botocore``] This release enhances the ListEntities API to support new entity type-specific strongly typed filters in the request and entity type-specific strongly typed summaries in the response.",
"type": "api-change"
},
{
"category": "``marketplace-deployment``",
"description": "[``botocore``] AWS Marketplace Deployment is a new service that provides essential features that facilitate the deployment of software, data, and services procured through AWS Marketplace.",
"type": "api-change"
},
{
"category": "``redshift-serverless``",
"description": "[``botocore``] This release adds the following support for Amazon Redshift Serverless: 1) cross-account cross-VPCs, 2) copying snapshots across Regions, 3) scheduling snapshot creation, and 4) restoring tables from a recovery point.",
"type": "api-change"
},
{
"category": "``endpoint-rules``",
"description": "[``botocore``] Update endpoint-rules client to latest version",
"type": "api-change"
}
]
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
CHANGELOG
=========

1.33.4
======

* bugfix:``s3transfer``: Raise floor for ``s3transfer`` to 0.8.2 to avoid any conflicts with the awscrt
* api-change:``marketplace-agreement``: [``botocore``] The AWS Marketplace Agreement Service provides an API interface that helps AWS Marketplace sellers manage their agreements, including listing, filtering, and viewing details about their agreements.
* api-change:``marketplace-catalog``: [``botocore``] This release enhances the ListEntities API to support new entity type-specific strongly typed filters in the request and entity type-specific strongly typed summaries in the response.
* api-change:``marketplace-deployment``: [``botocore``] AWS Marketplace Deployment is a new service that provides essential features that facilitate the deployment of software, data, and services procured through AWS Marketplace.
* api-change:``redshift-serverless``: [``botocore``] This release adds the following support for Amazon Redshift Serverless: 1) cross-account cross-VPCs, 2) copying snapshots across Regions, 3) scheduling snapshot creation, and 4) restoring tables from a recovery point.
* api-change:``endpoint-rules``: [``botocore``] Update endpoint-rules client to latest version


1.33.3
======

Expand Down
2 changes: 1 addition & 1 deletion boto3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from boto3.session import Session

__author__ = 'Amazon Web Services'
__version__ = '1.33.3'
__version__ = '1.33.4'


# The default Boto3 session; autoloaded when needed.
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ universal = 0

[metadata]
requires_dist =
botocore>=1.33.3,<1.34.0
botocore>=1.33.4,<1.34.0
jmespath>=0.7.1,<2.0.0
s3transfer>=0.8.0,<0.9.0
s3transfer>=0.8.2,<0.9.0

[options.extras_require]
crt = botocore[crt]>=1.21.0,<2.0a0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@


requires = [
'botocore>=1.33.3,<1.34.0',
'botocore>=1.33.4,<1.34.0',
'jmespath>=0.7.1,<2.0.0',
's3transfer>=0.8.0,<0.9.0',
's3transfer>=0.8.2,<0.9.0',
]


Expand Down
14 changes: 12 additions & 2 deletions tests/functional/test_crt.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

from contextlib import ContextDecorator

import pytest
from botocore.compat import HAS_CRT
from botocore.credentials import Credentials

Expand Down Expand Up @@ -71,9 +72,18 @@ def test_create_transfer_manager_on_optimized_instance(self):
def test_minimum_crt_version(self):
assert has_minimum_crt_version((0, 16, 12)) is True

@pytest.mark.parametrize(
"bad_version",
(
None,
"0.1.0-dev",
"0.20",
object(),
),
)
@requires_crt()
def test_minimum_crt_version_bad_crt_version(self):
def test_minimum_crt_version_bad_crt_version(self, bad_version):
with mock.patch("awscrt.__version__") as vers:
vers.return_value = None
vers.return_value = bad_version

assert has_minimum_crt_version((0, 16, 12)) is False

0 comments on commit b393ee1

Please sign in to comment.