Merge branch 'googleapis:main' into master

kamalaboulhosn · web-flow · commit 7ab0dea2c89c · 2024-04-17T15:58:07.000-04:00
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:a8a80fc6456e433df53fc2a0d72ca0345db0ddefb409f1b75b118dfd1babd952
-# created: 2024-03-15T16:25:47.905264637Z
+  digest: sha256:5a4c19d17e597b92d786e569be101e636c9c2817731f80a5adec56b2aa8fe070
+# created: 2024-04-12T11:35:58.922854369Z
diff --git a/.github/auto-label.yaml b/.github/auto-label.yaml
@@ -13,3 +13,8 @@
 # limitations under the License.
 requestsize:
   enabled: true
+
+path:
+  pullrequest: true
+  paths:
+    samples: "samples"
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
@@ -1,6 +1,17 @@
-# Configuration for the Blunderbuss GitHub app. For more info see
-# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
+# Blunderbuss config
+#
+# This file controls who is assigned for pull requests and issues.
+# Note: This file is autogenerated. To make changes to the assignee
+# team, please update `codeowner_team` in `.repo-metadata.json`.
 assign_issues:
   - mukund-ananthu
+
+assign_issues_by:
+  - labels:
+      - "samples"
+    to:
+      - googleapis/python-samples-reviewers
+      - mukund-ananthu
+
 assign_prs:
   - mukund-ananthu
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
@@ -252,9 +252,9 @@ googleapis-common-protos==1.61.0 \
     --hash=sha256:22f1915393bb3245343f6efe87f6fe868532efc12aa26b391b15132e1279f1c0 \
     --hash=sha256:8a64866a97f6304a7179873a465d6eee97b7a24ec6cfd78e0f575e96b821240b
     # via google-api-core
-idna==3.4 \
-    --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
-    --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
+idna==3.7 \
+    --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
+    --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
     # via requests
 importlib-metadata==6.8.0 \
     --hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-    ".": "2.21.0"
+    ".": "2.21.1"
 }
   
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@
 [1]: https://pypi.org/project/google-cloud-pubsub/#history
 
 
+## [2.21.1](https://github.com/googleapis/python-pubsub/compare/v2.21.0...v2.21.1) (2024-04-04)
+
+
+### Bug Fixes
+
+* Set timeout to infinite for publishing with ordering keys enabled ([#1134](https://github.com/googleapis/python-pubsub/issues/1134)) ([67daf3c](https://github.com/googleapis/python-pubsub/commit/67daf3c64239d22eabe59c3df214057a4e59a39e))
+
 ## [2.21.0](https://github.com/googleapis/python-pubsub/compare/v2.20.3...v2.21.0) (2024-03-26)
 
 
diff --git a/docs/index.rst b/docs/index.rst
@@ -41,3 +41,8 @@ For a list of all ``google-cloud-pubsub`` releases:
 
   changelog
 
+
+.. toctree::
+  :hidden:
+
+  summary_overview.md
diff --git a/docs/summary_overview.md b/docs/summary_overview.md
@@ -0,0 +1,22 @@
+[
+This is a templated file. Adding content to this file may result in it being
+reverted. Instead, if you want to place additional content, create an
+"overview_content.md" file in `docs/` directory. The Sphinx tool will
+pick up on the content and merge the content.
+]: #
+
+# Google Cloud Pub/Sub API
+
+Overview of the APIs available for Google Cloud Pub/Sub API.
+
+## All entries
+
+Classes, methods and properties & attributes for
+Google Cloud Pub/Sub API.
+
+[classes](https://cloud.google.com/python/docs/reference/pubsub/latest/summary_class.html)
+
+[methods](https://cloud.google.com/python/docs/reference/pubsub/latest/summary_method.html)
+
+[properties and
+attributes](https://cloud.google.com/python/docs/reference/pubsub/latest/summary_property.html)
diff --git a/google/cloud/pubsub_v1/publisher/client.py b/google/cloud/pubsub_v1/publisher/client.py
@@ -399,8 +399,13 @@ def on_publish_done(future):
                     transport = self._transport
                     base_retry = transport._wrapped_methods[transport.publish]._retry
                     retry = base_retry.with_deadline(2.0**32)
+                    # timeout needs to be overridden and set to infinite in
+                    # addition to the retry deadline since both determine
+                    # the duration for which retries are attempted.
+                    timeout = 2.0**32
                 elif retry is not None:
                     retry = retry.with_deadline(2.0**32)
+                    timeout = 2.0**32
 
             # Delegate the publishing to the sequencer.
             sequencer = self._get_or_create_sequencer(topic, ordering_key)
diff --git a/google/pubsub/gapic_version.py b/google/pubsub/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.21.0"  # {x-release-please-version}
+__version__ = "2.21.1"  # {x-release-please-version}
diff --git a/google/pubsub_v1/gapic_version.py b/google/pubsub_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.21.0"  # {x-release-please-version}
+__version__ = "2.21.1"  # {x-release-please-version}
diff --git a/owlbot.py b/owlbot.py
@@ -432,6 +432,7 @@ def mypy_samples(session):
     "noxfile.py", "--cov=google", "--cov=google/cloud",
 )
 
+s.replace(".github/blunderbuss.yml", "googleapis/api-pubsub", "mukund-ananthu")
 
 python.py_samples(skip_readmes=True)
 
diff --git a/samples/generated_samples/snippet_metadata_google.pubsub.v1.json b/samples/generated_samples/snippet_metadata_google.pubsub.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-pubsub",
-    "version": "2.21.0"
+    "version": "2.21.1"
   },
   "snippets": [
     {
diff --git a/samples/snippets/requirements-test.txt b/samples/snippets/requirements-test.txt
@@ -1,6 +1,7 @@
 backoff==2.2.1
-pytest==7.4.3
+pytest===7.4.4; python_version == '3.7'
+pytest==8.1.1; python_version >= '3.8'
 mock==5.1.0
-flaky==3.7.0
-google-cloud-bigquery==3.14.1
-google-cloud-storage==2.14.0
+flaky==3.8.1
+google-cloud-bigquery==3.20.1
+google-cloud-storage==2.16.0
diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt
@@ -1,5 +1,5 @@
-google-cloud-pubsub==2.20.1
+google-cloud-pubsub==2.21.1
 avro==1.11.3
 protobuf===4.24.4; python_version == '3.7'
-protobuf==4.25.1; python_version >= '3.8'
+protobuf==4.25.2; python_version >= '3.8'
 avro==1.11.3
diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -316,6 +316,10 @@ def test_publish_with_ordering_key_uses_extended_retry_deadline(creds):
     expected_retry = custom_retry.with_deadline(2.0**32)
     _assert_retries_equal(batch_commit_retry, expected_retry)
 
+    batch_commit_timeout = kwargs["commit_timeout"]
+    expected_timeout = 2.0**32
+    assert batch_commit_timeout == pytest.approx(expected_timeout)
+
 
 def test_publish_with_ordering_key_with_no_retry(creds):
     client = publisher.Client(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- ".": "2.21.0"`
	`2`	`+ ".": "2.21.1"`
`3`	`3`	`}`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-__version__ = "2.21.0" # {x-release-please-version}`
	`16`	`+__version__ = "2.21.1" # {x-release-please-version}`