Skip to content

Commit

Permalink
Merge branch 'release-1.26.102'
Browse files Browse the repository at this point in the history
* release-1.26.102:
  Bumping version to 1.26.102
  Add changelog entries from botocore
  Sms voice fix (#3640)
  Change usage to use boto3.client() instead of boto3.resource().meta.client (#3644)
  • Loading branch information
aws-sdk-python-automation committed Mar 29, 2023
2 parents 97db397 + a497c6b commit 9e1b376
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 8 deletions.
12 changes: 12 additions & 0 deletions .changes/1.26.102.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"category": "``opensearchserverless``",
"description": "[``botocore``] This release includes two new exception types \"ServiceQuotaExceededException\" and \"OcuLimitExceededException\".",
"type": "api-change"
},
{
"category": "``rds``",
"description": "[``botocore``] Add support for creating a read replica DB instance from a Multi-AZ DB cluster.",
"type": "api-change"
}
]
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
CHANGELOG
=========

1.26.102
========

* api-change:``opensearchserverless``: [``botocore``] This release includes two new exception types "ServiceQuotaExceededException" and "OcuLimitExceededException".
* api-change:``rds``: [``botocore``] Add support for creating a read replica DB instance from a Multi-AZ DB cluster.


1.26.101
========

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.26.101'
__version__ = '1.26.102'


# The default Boto3 session; autoloaded when needed.
Expand Down
11 changes: 10 additions & 1 deletion boto3/docs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# language governing permissions and limitations under the License.
import os

from botocore.docs import DEPRECATED_SERVICE_NAMES

from boto3.docs.service import ServiceDocumenter


Expand All @@ -31,7 +33,14 @@ def generate_docs(root_dir, session):
if not os.path.exists(services_doc_path):
os.makedirs(services_doc_path)

for service_name in session.get_available_services():
# Prevents deprecated service names from being generated in docs.
available_services = [
service
for service in session.get_available_services()
if service not in DEPRECATED_SERVICE_NAMES
]

for service_name in available_services:
docs = ServiceDocumenter(
service_name, session, services_doc_path
).document_service()
Expand Down
8 changes: 4 additions & 4 deletions boto3/s3/inject.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ def upload_file(
Usage::
import boto3
s3 = boto3.resource('s3')
s3.meta.client.upload_file('/tmp/hello.txt', 'mybucket', 'hello.txt')
s3 = boto3.client('s3')
s3.upload_file('/tmp/hello.txt', 'mybucket', 'hello.txt')
Similar behavior as S3Transfer's upload_file() method,
except that parameters are capitalized. Detailed examples can be found at
Similar behavior as S3Transfer's upload_file() method, except that
argument names are capitalized. Detailed examples can be found at
:ref:`S3Transfer's Usage <ref_s3transfer_usage>`.
:type Filename: str
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ universal = 0

[metadata]
requires_dist =
botocore>=1.29.101,<1.30.0
botocore>=1.29.102,<1.30.0
jmespath>=0.7.1,<2.0.0
s3transfer>=0.6.0,<0.7.0

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


requires = [
'botocore>=1.29.101,<1.30.0',
'botocore>=1.29.102,<1.30.0',
'jmespath>=0.7.1,<2.0.0',
's3transfer>=0.6.0,<0.7.0',
]
Expand Down

0 comments on commit 9e1b376

Please sign in to comment.