Skip to content

Commit

Permalink
Merge branch 'release-1.9.86'
Browse files Browse the repository at this point in the history
* release-1.9.86:
  Bumping version to 1.9.86
  Call super in boto3's service documenter
  Add changelog entries from botocore
  • Loading branch information
aws-sdk-python-automation committed Jan 25, 2019
2 parents 383f923 + 9a56e4a commit dc5aa23
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 7 deletions.
22 changes: 22 additions & 0 deletions .changes/1.9.86.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"category": "``devicefarm``",
"description": "[``botocore``] Update devicefarm client to latest version",
"type": "api-change"
},
{
"category": "``codecommit``",
"description": "[``botocore``] Update codecommit client to latest version",
"type": "api-change"
},
{
"category": "``medialive``",
"description": "[``botocore``] Update medialive client to latest version",
"type": "api-change"
},
{
"category": "``mediaconnect``",
"description": "[``botocore``] Update mediaconnect client to latest version",
"type": "api-change"
}
]
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
CHANGELOG
=========

1.9.86
======

* api-change:``devicefarm``: [``botocore``] Update devicefarm client to latest version
* api-change:``codecommit``: [``botocore``] Update codecommit client to latest version
* api-change:``medialive``: [``botocore``] Update medialive client to latest version
* api-change:``mediaconnect``: [``botocore``] Update mediaconnect client to latest version


1.9.85
======

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 @@


__author__ = 'Amazon Web Services'
__version__ = '1.9.85'
__version__ = '1.9.86'


# The default Boto3 session; autoloaded when needed.
Expand Down
10 changes: 6 additions & 4 deletions boto3/docs/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ class ServiceDocumenter(BaseServiceDocumenter):
EXAMPLE_PATH = os.path.join(os.path.dirname(boto3.__file__), 'examples')

def __init__(self, service_name, session):
self._service_name = service_name
super(ServiceDocumenter, self).__init__(
service_name=service_name,
# I know that this is an internal attribute, but the botocore session
# is needed to load the paginator and waiter models.
session=session._session,
)
self._boto3_session = session
# I know that this is an internal attribute, but the botocore session
# is needed to load the paginator and waiter models.
self._session = session._session
self._client = self._boto3_session.client(service_name)
self._service_resource = None
if self._service_name in self._boto3_session.get_available_resources():
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ universal = 1

[metadata]
requires-dist =
botocore>=1.12.85,<1.13.0
botocore>=1.12.86,<1.13.0
jmespath>=0.7.1,<1.0.0
s3transfer>=0.1.10,<0.2.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


requires = [
'botocore>=1.12.85,<1.13.0',
'botocore>=1.12.86,<1.13.0',
'jmespath>=0.7.1,<1.0.0',
's3transfer>=0.1.10,<0.2.0'
]
Expand Down

0 comments on commit dc5aa23

Please sign in to comment.