Skip to content

Commit d98b6a2

Browse files
kamalaboulhosnkamalaboulhosn
authored
Merge branch 'master' into add_client_id
2 parents 172252e + c67f36e commit d98b6a2

24 files changed

Lines changed: 902 additions & 380 deletions

‎.coveragerc‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# -*- coding: utf-8 -*-
2+
#
3+
# Copyright 2020 Google LLC
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
117
# Generated by synthtool. DO NOT EDIT!
218
[run]
319
branch = True

‎.flake8‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# -*- coding: utf-8 -*-
2+
#
3+
# Copyright 2020 Google LLC
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
117
# Generated by synthtool. DO NOT EDIT!
218
[flake8]
319
ignore = E203, E266, E501, W503

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ Thanks for stopping by to let us know something could be better!
1111
Please run down the following list and make sure you've tried the usual "quick fixes":
1212

1313
- Search the issues already opened: https://github.com/googleapis/python-pubsub/issues
14-
- Search the issues on our "catch-all" repository: https://github.com/googleapis/google-cloud-python
15-
- Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+python
14+
- Search StackOverflow: https://stackoverflow.com/questions/tagged/google-cloud-platform+python
1615

1716
If you are still having issues, please be sure to include as much information as possible:
1817

‎CHANGELOG.md‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,53 @@
44

55
[1]: https://pypi.org/project/google-cloud-pubsub/#history
66

7-
### [1.4.2](https://www.github.com/googleapis/python-pubsub/compare/v1.4.1...v1.4.2) (2020-03-25)
7+
## [1.4.3](https://www.github.com/googleapis/python-pubsub/compare/v1.4.2...v1.4.3) (2020-04-16)
88

99

10+
### Bug Fixes
11+
12+
* fix docs warnings in Sphinx 3.0+ ([#70](https://www.github.com/googleapis/python-pubsub/issues/70)) ([21e761e](https://www.github.com/googleapis/python-pubsub/commit/21e761ee89a4c03e105dc9cddbab0a34be9a9fda))
13+
* restrict api-core dependency to < 1.17.0 ([#76](https://www.github.com/googleapis/python-pubsub/issues/76)) ([191b051](https://www.github.com/googleapis/python-pubsub/commit/191b0516335f5c60828a818ba79e99d6c68aa7bd))
14+
15+
## [1.4.2](https://www.github.com/googleapis/python-pubsub/compare/v1.4.1...v1.4.2) (2020-03-25)
16+
1017
### Bug Fixes
1118

1219
* update generated retry timings for publish and pull rpcs via synth ([#43](https://www.github.com/googleapis/python-pubsub/issues/43)) ([4f7fe85](https://www.github.com/googleapis/python-pubsub/commit/4f7fe85618d811fea94cb46b5dc758aa78c328a8))
1320
* use client_options.api_endpoint parameter instead of ignoring it ([#59](https://www.github.com/googleapis/python-pubsub/issues/59)) ([56b8d7b](https://www.github.com/googleapis/python-pubsub/commit/56b8d7b046a495ce2ce59bebdd354385147a5013)), closes [#61](https://www.github.com/googleapis/python-pubsub/issues/61)
1421

15-
### [1.4.1](https://www.github.com/googleapis/python-pubsub/compare/v1.4.0...v1.4.1) (2020-03-23)
16-
22+
## [1.4.1](https://www.github.com/googleapis/python-pubsub/compare/v1.4.0...v1.4.1) (2020-03-23)
1723

1824
### Bug Fixes
1925

2026
* Don't assert on unordered publishes after publish error. ([#49](https://www.github.com/googleapis/python-pubsub/issues/49)) ([ea19ce6](https://www.github.com/googleapis/python-pubsub/commit/ea19ce616f6961e8993b72cd2921f7f3e61541f9))
2127

2228
## [1.4.0](https://www.github.com/googleapis/python-pubsub/compare/v1.3.1...v1.4.0) (2020-03-06)
2329

24-
2530
### Features
2631

2732
* **pubsub:** implement max_duration_per_lease_extension option ([#38](https://www.github.com/googleapis/python-pubsub/issues/38)) ([d911a2d](https://www.github.com/googleapis/python-pubsub/commit/d911a2dc8edf3c348ad3f128368b30e32dbc449e))
2833

29-
### [1.3.1](https://www.github.com/googleapis/python-pubsub/compare/v1.3.0...v1.3.1) (2020-02-28)
30-
34+
## [1.3.1](https://www.github.com/googleapis/python-pubsub/compare/v1.3.0...v1.3.1) (2020-02-28)
3135

3236
### Bug Fixes
3337

3438
* shutdown error on streaming pull callback error ([#40](https://www.github.com/googleapis/python-pubsub/issues/40)) ([552539e](https://www.github.com/googleapis/python-pubsub/commit/552539e7beb30833c39dd29bfcb0183a07895f97))
3539

3640
## [1.3.0](https://www.github.com/googleapis/python-pubsub/compare/v1.2.0...v1.3.0) (2020-02-20)
3741

38-
3942
### Features
4043

4144
* **pubsub:** ordering keys ([#26](https://www.github.com/googleapis/python-pubsub/issues/26)) ([cc3093a](https://www.github.com/googleapis/python-pubsub/commit/cc3093a2c0304259bc374bc2eeec9630e4a11a5e))
4245
* add context manager capability to subscriber ([#32](https://www.github.com/googleapis/python-pubsub/issues/32)) ([b58d0d8](https://www.github.com/googleapis/python-pubsub/commit/b58d0d8e404c0a085b89d3407e6640651e81568c))
4346

4447
## [1.2.0](https://www.github.com/googleapis/python-pubsub/compare/v1.1.0...v1.2.0) (2020-02-05)
4548

46-
4749
### Features
4850

4951
* **pubsub:** add delivery attempt property to message object received by user code ([#10205](https://www.github.com/googleapis/google-cloud-python/issues/10205)) ([a0937c1](https://www.github.com/googleapis/python-pubsub/commit/a0937c13107b92271913de579b60f24b2aaac177))
5052
* add `StreamingPullRequest.client_id` field (via synth) ([199d56a](https://www.github.com/googleapis/python-pubsub/commit/199d56a939bb6244f67138f843dafdd80721f0d3))
5153

52-
5354
### Bug Fixes
5455

5556
* **pubsub:** handle None in on response callback ([#9982](https://www.github.com/googleapis/google-cloud-python/issues/9982)) ([6596c4b](https://www.github.com/googleapis/python-pubsub/commit/6596c4bae5526d82f5c1b5e0c243b2883404d51f))
@@ -158,7 +159,7 @@
158159
- Use kwargs in test_subscriber_client ([#8414](https://github.com/googleapis/google-cloud-python/pull/8414))
159160

160161
### New Features
161-
- Add 'options_' argument to clients' 'get_iam_policy'; pin black version (via synth). ([#8657](https://github.com/googleapis/google-cloud-python/pull/8657))
162+
- Add `options_` argument to clients' `get_iam_policy`; pin black version (via synth). ([#8657](https://github.com/googleapis/google-cloud-python/pull/8657))
162163
- Add 'client_options' support, update list method docstrings (via synth). ([#8518](https://github.com/googleapis/google-cloud-python/pull/8518))
163164

164165
### Dependencies
@@ -420,8 +421,7 @@
420421

421422
### New Features
422423

423-
- A new implementation of the subscriber has been added. This is available as `SubscriberClient.subscribe_experimental`. In the next release, this will be replace the current `subscribe` method. If you use this, please report your
424-
findings to us on GitHub. (#5189, #5201, #5210, #5229, #5230, #5237, #5256)
424+
- A new implementation of the subscriber has been added. This is available as `SubscriberClient.subscribe_experimental`. In the next release, this will be replace the current `subscribe` method. If you use this, please report your findings to us on GitHub. (#5189, #5201, #5210, #5229, #5230, #5237, #5256)
425425

426426
### Dependencies
427427

@@ -524,6 +524,7 @@ PyPI: https://pypi.org/project/google-cloud-pubsub/0.30.1/
524524
when a "monitor" worker calls `commit()` after `max_latency` seconds,
525525
a failure can occur if a new message is added to the batch **during**
526526
the commit. To fix, the following changes were implemented:
527+
527528
- Adding a "STARTING" status for `Batch.commit()` (#4614). This
528529
fixes the issue when the batch exceeds `max_messages`.
529530
- Adding extra check in `Batch.will_accept` for the number of
@@ -601,10 +602,12 @@ PyPI: https://pypi.org/project/google-cloud-pubsub/0.29.3/
601602
running after encountering an exception (#4472, #4498). This bug
602603
is the **only** reason for the `0.29.2` release.
603604
- Thread Changes
605+
604606
- Added names to all threads created directly by Pub / Sub (#4474,
605607
#4476, #4480). Also removing spaces and colons from thread
606608
names (#4476).
607609
- Logging changes
610+
608611
- Adding debug logs when lease management exits (#4484)
609612
- Adding debug logs when `QueueCallbackThread` exits (#4494).
610613
Instances handle the processing of messages in a
@@ -656,6 +659,6 @@ PyPI: https://pypi.org/project/google-cloud-pubsub/0.29.1/
656659
- Upgrading to `google-cloud-core >= 0.28.0` and adding dependency
657660
on `google-api-core` (#4221, #4280)
658661
- Deferring to `google-api-core` for `grpcio` and
659-
`googleapis-common-protos`dependencies (#4096, #4098)
662+
`googleapis-common-protos` dependencies (#4096, #4098)
660663

661664
PyPI: https://pypi.org/project/google-cloud-pubsub/0.29.0/

‎CONTRIBUTING.rst‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In order to add a feature:
2222
documentation.
2323

2424
- The feature must work fully on the following CPython versions: 2.7,
25-
3.5, 3.6, and 3.7 on both UNIX and Windows.
25+
3.5, 3.6, 3.7 and 3.8 on both UNIX and Windows.
2626

2727
- The feature must not add unnecessary dependencies (where
2828
"unnecessary" is of course subjective, but new dependencies should
@@ -214,26 +214,18 @@ We support:
214214
- `Python 3.5`_
215215
- `Python 3.6`_
216216
- `Python 3.7`_
217+
- `Python 3.8`_
217218

218219
.. _Python 3.5: https://docs.python.org/3.5/
219220
.. _Python 3.6: https://docs.python.org/3.6/
220221
.. _Python 3.7: https://docs.python.org/3.7/
222+
.. _Python 3.8: https://docs.python.org/3.8/
221223

222224

223225
Supported versions can be found in our ``noxfile.py`` `config`_.
224226

225227
.. _config: https://github.com/googleapis/python-pubsub/blob/master/noxfile.py
226228

227-
We explicitly decided not to support `Python 2.5`_ due to `decreased usage`_
228-
and lack of continuous integration `support`_.
229-
230-
.. _Python 2.5: https://docs.python.org/2.5/
231-
.. _decreased usage: https://caremad.io/2013/10/a-look-at-pypi-downloads/
232-
.. _support: https://blog.travis-ci.com/2013-11-18-upcoming-build-environment-updates/
233-
234-
We have `dropped 2.6`_ as a supported version as well since Python 2.6 is no
235-
longer supported by the core development team.
236-
237229
Python 2.7 support is deprecated. All code changes should maintain Python 2.7 compatibility until January 1, 2020.
238230

239231
We also explicitly decided to support Python 3 beginning with version
@@ -247,7 +239,6 @@ We also explicitly decided to support Python 3 beginning with version
247239
.. _prominent: https://docs.djangoproject.com/en/1.9/faq/install/#what-python-version-can-i-use-with-django
248240
.. _projects: http://flask.pocoo.org/docs/0.10/python3/
249241
.. _Unicode literal support: https://www.python.org/dev/peps/pep-0414/
250-
.. _dropped 2.6: https://github.com/googleapis/google-cloud-python/issues/995
251242

252243
**********
253244
Versioning

‎MANIFEST.in‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# -*- coding: utf-8 -*-
2+
#
3+
# Copyright 2020 Google LLC
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
117
# Generated by synthtool. DO NOT EDIT!
218
include README.rst LICENSE
319
recursive-include google *.json *.proto

‎docs/conf.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"sphinx.ext.napoleon",
3939
"sphinx.ext.todo",
4040
"sphinx.ext.viewcode",
41+
"recommonmark",
4142
]
4243

4344
# autodoc/autosummary flags
@@ -49,10 +50,6 @@
4950
# Add any paths that contain templates here, relative to this directory.
5051
templates_path = ["_templates"]
5152

52-
# Allow markdown includes (so releases.md can include CHANGLEOG.md)
53-
# http://www.sphinx-doc.org/en/master/markdown.html
54-
source_parsers = {".md": "recommonmark.parser.CommonMarkParser"}
55-
5653
# The suffix(es) of source filenames.
5754
# You can specify multiple suffix as a list of string:
5855
# source_suffix = ['.rst', '.md']

‎docs/subscriber/api/message.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Messages
33

44
.. autoclass:: google.cloud.pubsub_v1.subscriber.message.Message
55
:members:
6+
:noindex:

‎docs/types.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Pub/Sub Client Types
33

44
.. automodule:: google.cloud.pubsub_v1.types
55
:members:
6+
:noindex:

0 commit comments

Comments
 (0)