Merge branch 'main' into add-samples-gcs

googleapis · Jul 28, 2023 · a6c706c · a6c706c
2 parents 2c93ed3 + 9a58bf3
commit a6c706c
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 16 deletions.
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:39f0f3f2be02ef036e297e376fe3b6256775576da8a6ccb1d5eeb80f4c8bf8fb
-# created: 2023-07-17T15:20:13.819193964Z
+  digest: sha256:6c1cbc75c74b8bdd71dada2fa1677e9d6d78a889e9a70ee75b93d1d0543f96e1
+# created: 2023-07-25T21:01:10.396410762Z
diff --git a/.github/flakybot.yaml b/.github/flakybot.yaml
@@ -0,0 +1 @@
+issuePriority: p2
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
@@ -20,9 +20,9 @@ cachetools==5.2.0 \
     --hash=sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757 \
     --hash=sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db
     # via google-auth
-certifi==2022.12.7 \
-    --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \
-    --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
+certifi==2023.7.22 \
+    --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \
+    --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9
     # via requests
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
@@ -396,9 +396,9 @@ pycparser==2.21 \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
     --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
     # via cffi
-pygments==2.13.0 \
-    --hash=sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1 \
-    --hash=sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42
+pygments==2.15.0 \
+    --hash=sha256:77a3299119af881904cd5ecd1ac6a66214b6e9bed1f2db16993b54adede64094 \
+    --hash=sha256:f7e36cffc4c517fbc252861b9a6e4644ca0e5abadf9a113c72d1358ad09b9500
     # via
     #   readme-renderer
     #   rich

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-    ".": "2.18.0"
+    ".": "2.18.1"
 }
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@
 [1]: https://pypi.org/project/google-cloud-pubsub/#history
 
 
+## [2.18.1](https://github.com/googleapis/python-pubsub/compare/v2.18.0...v2.18.1) (2023-07-26)
+
+
+### Documentation
+
+* Clarified where ordering_key will be written if write_metadata is set ([#965](https://github.com/googleapis/python-pubsub/issues/965)) ([3d95034](https://github.com/googleapis/python-pubsub/commit/3d95034f94426cdcf5b87323b9e463a7e8ce4f91))
+
 ## [2.18.0](https://github.com/googleapis/python-pubsub/compare/v2.17.1...v2.18.0) (2023-07-12)
 
 

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.18.0"  # {x-release-please-version}
+__version__ = "2.18.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.18.0"  # {x-release-please-version}
+__version__ = "2.18.1"  # {x-release-please-version}
diff --git a/google/pubsub_v1/types/pubsub.py b/google/pubsub_v1/types/pubsub.py
@@ -1277,7 +1277,11 @@ class AvroConfig(proto.Message):
             write_metadata (bool):
                 When true, write the subscription name, message_id,
                 publish_time, attributes, and ordering_key as additional
-                fields in the output.
+                fields in the output. The subscription name, message_id, and
+                publish_time fields are put in their own fields while all
+                other message properties other than data (for example, an
+                ordering_key, if present) are added as entries in the
+                attributes map.
         """
 
         write_metadata: bool = proto.Field(

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.18.0"
+    "version": "2.18.1"
   },
   "snippets": [
     {

diff --git a/samples/snippets/requirements-test.txt b/samples/snippets/requirements-test.txt
@@ -2,5 +2,5 @@ backoff==2.2.1
 pytest==7.4.0
 mock==5.1.0
 flaky==3.7.0
-google-cloud-bigquery==3.11.3
+google-cloud-bigquery==3.11.4
 google-cloud-storage==2.9.0
diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt
@@ -1,4 +1,4 @@
-google-cloud-pubsub==2.18.0
+google-cloud-pubsub==2.18.1
 avro==1.11.2
 protobuf==4.21.9
 avro==1.11.2
diff --git a/samples/snippets/schema.py b/samples/snippets/schema.py
@@ -727,7 +727,7 @@ def callback(message: pubsub_v1.subscriber.message.Message) -> None:
         # Deserialize the message data accordingly.
         if encoding == "BINARY":
             state.ParseFromString(message.data)
-            print("Received a binary-encoded message:\n{state}")
+            print(f"Received a binary-encoded message:\n{state}")
         elif encoding == "JSON":
             Parse(message.data, state)
             print(f"Received a JSON-encoded message:\n{state}")