Skip to content

Commit a9bba14

Browse files
Merge branch 'release-1.18.46'
* release-1.18.46: Bumping version to 1.18.46 Add changelog entries from botocore Update Return type of _get_related_resources to Action (#2803) Update to last released version of nose (#3004)
2 parents 59b337f + 9d0a498 commit a9bba14

File tree

8 files changed

+60
-9
lines changed

8 files changed

+60
-9
lines changed

.changes/1.18.46.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[
2+
{
3+
"category": "``imagebuilder``",
4+
"description": "[``botocore``] This feature adds support for specifying GP3 volume throughput and configuring instance metadata options for instances launched by EC2 Image Builder.",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``wafv2``",
9+
"description": "[``botocore``] Added the regex match rule statement, for matching web requests against a single regular expression.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``mediatailor``",
14+
"description": "[``botocore``] This release adds support to configure logs for playback configuration.",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``lexv2-models``",
19+
"description": "[``botocore``] Update lexv2-models client to latest version",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``iam``",
24+
"description": "[``botocore``] Added changes to OIDC API about not using port numbers in the URL.",
25+
"type": "api-change"
26+
},
27+
{
28+
"category": "``license-manager``",
29+
"description": "[``botocore``] AWS License Manager now allows customers to change their Windows Server or SQL license types from Bring-Your-Own-License (BYOL) to License Included or vice-versa (using the customer's media).",
30+
"type": "api-change"
31+
},
32+
{
33+
"category": "``mediapackage-vod``",
34+
"description": "[``botocore``] MediaPackage VOD will now return the current processing statuses of an asset's endpoints. The status can be QUEUED, PROCESSING, PLAYABLE, or FAILED.",
35+
"type": "api-change"
36+
}
37+
]

CHANGELOG.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
CHANGELOG
33
=========
44

5+
1.18.46
6+
=======
7+
8+
* api-change:``imagebuilder``: [``botocore``] This feature adds support for specifying GP3 volume throughput and configuring instance metadata options for instances launched by EC2 Image Builder.
9+
* api-change:``wafv2``: [``botocore``] Added the regex match rule statement, for matching web requests against a single regular expression.
10+
* api-change:``mediatailor``: [``botocore``] This release adds support to configure logs for playback configuration.
11+
* api-change:``lexv2-models``: [``botocore``] Update lexv2-models client to latest version
12+
* api-change:``iam``: [``botocore``] Added changes to OIDC API about not using port numbers in the URL.
13+
* api-change:``license-manager``: [``botocore``] AWS License Manager now allows customers to change their Windows Server or SQL license types from Bring-Your-Own-License (BYOL) to License Included or vice-versa (using the customer's media).
14+
* api-change:``mediapackage-vod``: [``botocore``] MediaPackage VOD will now return the current processing statuses of an asset's endpoints. The status can be QUEUED, PROCESSING, PLAYABLE, or FAILED.
15+
16+
517
1.18.45
618
=======
719

boto3/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
__author__ = 'Amazon Web Services'
21-
__version__ = '1.18.45'
21+
__version__ = '1.18.46'
2222

2323

2424
# The default Boto3 session; autoloaded when needed.

boto3/resources/model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ def _get_related_resources(self, subresources):
549549
:type subresources: bool
550550
:param subresources: ``True`` to get sub-resources, ``False`` to
551551
get references.
552-
:rtype: list(:py:class:`ResponseResource`)
552+
:rtype: list(:py:class:`Action`)
553553
"""
554554
resources = []
555555

@@ -578,7 +578,7 @@ def subresources(self):
578578
"""
579579
Get a list of sub-resources.
580580
581-
:type: list(:py:class:`ResponseResource`)
581+
:type: list(:py:class:`Action`)
582582
"""
583583
return self._get_related_resources(True)
584584

@@ -587,7 +587,7 @@ def references(self):
587587
"""
588588
Get a list of reference resources.
589589
590-
:type: list(:py:class:`ResponseResource`)
590+
:type: list(:py:class:`Action`)
591591
"""
592592
return self._get_related_resources(False)
593593

requirements-dev-lock.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,10 @@ iniconfig==1.1.1 \
8282
--hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
8383
--hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
8484
# via pytest
85-
nose==1.3.3 \
86-
--hash=sha256:b40c2ff268beb85356ada25f626ca0dabc89705f31051649772cf00fc9510326
85+
nose==1.3.7 \
86+
--hash=sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac \
87+
--hash=sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a \
88+
--hash=sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98
8789
# via -r requirements-dev.txt
8890
packaging==21.0 \
8991
--hash=sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7 \

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
nose==1.3.3
1+
nose==1.3.7
22
wheel==0.37.0
33
coverage==5.5
44

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ universal = 0
33

44
[metadata]
55
requires_dist =
6-
botocore>=1.21.45,<1.22.0
6+
botocore>=1.21.46,<1.22.0
77
jmespath>=0.7.1,<1.0.0
88
s3transfer>=0.5.0,<0.6.0
99

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
requires = [
17-
'botocore>=1.21.45,<1.22.0',
17+
'botocore>=1.21.46,<1.22.0',
1818
'jmespath>=0.7.1,<1.0.0',
1919
's3transfer>=0.5.0,<0.6.0'
2020
]

0 commit comments

Comments
 (0)