From 3e27b8182785f6042976acb9e94bfac4dae8b49d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 16:45:53 -0700 Subject: [PATCH 1/7] chore(deps): bump requests from 2.28.1 to 2.31.0 in /.kokoro (#499) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): bump requests from 2.28.1 to 2.31.0 in /.kokoro Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.31.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.28.1...v2.31.0) --- updated-dependencies: - dependency-name: requests dependency-type: indirect ... Signed-off-by: dependabot[bot] * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot From 8aff9ef48da14fbe110006f14949ba625387cdae Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 16:14:25 +0000 Subject: [PATCH 2/7] build(deps): bump requests to 2.31.0 [autoapprove] (#500) Source-Link: https://togithub.com/googleapis/synthtool/commit/30bd01b4ab78bf1b2a425816e15b3e7e090993dd Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:9bc5fa3b62b091f60614c08a7fb4fd1d3e1678e326f34dd66ce1eefb5dc3267b --- .github/.OwlBot.lock.yaml | 3 ++- .kokoro/requirements.txt | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b8edda51..32b3c486 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:2e247c7bf5154df7f98cce087a20ca7605e236340c7d6d1a14447e5c06791bd6 + digest: sha256:9bc5fa3b62b091f60614c08a7fb4fd1d3e1678e326f34dd66ce1eefb5dc3267b +# created: 2023-05-25T14:56:16.294623272Z diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 66a2172a..3b8d7ee8 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -419,9 +419,9 @@ readme-renderer==37.3 \ --hash=sha256:cd653186dfc73055656f090f227f5cb22a046d7f71a841dfa305f55c9a513273 \ --hash=sha256:f67a16caedfa71eef48a31b39708637a6f4664c4394801a7b0d6432d13907343 # via twine -requests==2.28.1 \ - --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 \ - --hash=sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349 +requests==2.31.0 \ + --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ + --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 # via # gcp-releasetool # google-api-core From 3f7f38d71b83f44a08acde2e21faaaa62cb37b01 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 3 Jun 2023 22:00:46 +0000 Subject: [PATCH 3/7] build(deps): bump cryptography to 41.0.0 [autoapprove] (#502) Source-Link: https://togithub.com/googleapis/synthtool/commit/d0f51a0c2a9a6bcca86911eabea9e484baadf64b Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:240b5bcc2bafd450912d2da2be15e62bc6de2cf839823ae4bf94d4f392b451dc --- .github/.OwlBot.lock.yaml | 4 ++-- .kokoro/requirements.txt | 42 +++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 32b3c486..02a4dedc 100644 --- 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:9bc5fa3b62b091f60614c08a7fb4fd1d3e1678e326f34dd66ce1eefb5dc3267b -# created: 2023-05-25T14:56:16.294623272Z + digest: sha256:240b5bcc2bafd450912d2da2be15e62bc6de2cf839823ae4bf94d4f392b451dc +# created: 2023-06-03T21:25:37.968717478Z diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 3b8d7ee8..c7929db6 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -113,28 +113,26 @@ commonmark==0.9.1 \ --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \ --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9 # via rich -cryptography==39.0.1 \ - --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \ - --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \ - --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \ - --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \ - --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \ - --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \ - --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \ - --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \ - --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \ - --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \ - --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \ - --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \ - --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \ - --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \ - --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \ - --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \ - --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \ - --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \ - --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \ - --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \ - --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8 +cryptography==41.0.0 \ + --hash=sha256:0ddaee209d1cf1f180f1efa338a68c4621154de0afaef92b89486f5f96047c55 \ + --hash=sha256:14754bcdae909d66ff24b7b5f166d69340ccc6cb15731670435efd5719294895 \ + --hash=sha256:344c6de9f8bda3c425b3a41b319522ba3208551b70c2ae00099c205f0d9fd3be \ + --hash=sha256:34d405ea69a8b34566ba3dfb0521379b210ea5d560fafedf9f800a9a94a41928 \ + --hash=sha256:3680248309d340fda9611498a5319b0193a8dbdb73586a1acf8109d06f25b92d \ + --hash=sha256:3c5ef25d060c80d6d9f7f9892e1d41bb1c79b78ce74805b8cb4aa373cb7d5ec8 \ + --hash=sha256:4ab14d567f7bbe7f1cdff1c53d5324ed4d3fc8bd17c481b395db224fb405c237 \ + --hash=sha256:5c1f7293c31ebc72163a9a0df246f890d65f66b4a40d9ec80081969ba8c78cc9 \ + --hash=sha256:6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78 \ + --hash=sha256:7d92f0248d38faa411d17f4107fc0bce0c42cae0b0ba5415505df72d751bf62d \ + --hash=sha256:8362565b3835ceacf4dc8f3b56471a2289cf51ac80946f9087e66dc283a810e0 \ + --hash=sha256:84a165379cb9d411d58ed739e4af3396e544eac190805a54ba2e0322feb55c46 \ + --hash=sha256:88ff107f211ea696455ea8d911389f6d2b276aabf3231bf72c8853d22db755c5 \ + --hash=sha256:9f65e842cb02550fac96536edb1d17f24c0a338fd84eaf582be25926e993dde4 \ + --hash=sha256:a4fc68d1c5b951cfb72dfd54702afdbbf0fb7acdc9b7dc4301bbf2225a27714d \ + --hash=sha256:b7f2f5c525a642cecad24ee8670443ba27ac1fab81bba4cc24c7b6b41f2d0c75 \ + --hash=sha256:b846d59a8d5a9ba87e2c3d757ca019fa576793e8758174d3868aecb88d6fc8eb \ + --hash=sha256:bf8fc66012ca857d62f6a347007e166ed59c0bc150cefa49f28376ebe7d992a2 \ + --hash=sha256:f5d0bf9b252f30a31664b6f64432b4730bb7038339bd18b1fafe129cfc2be9be # via # gcp-releasetool # secretstorage From 34237a57f26aaed865879a7a988968a2ba91f75b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 13:24:12 +0000 Subject: [PATCH 4/7] chore: remove pinned Sphinx version [autoapprove] (#503) Source-Link: https://togithub.com/googleapis/synthtool/commit/909573ce9da2819eeb835909c795d29aea5c724e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:ddf4551385d566771dc713090feb7b4c1164fb8a698fe52bbe7670b24236565b --- .github/.OwlBot.lock.yaml | 4 ++-- noxfile.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 02a4dedc..1b3cb6c5 100644 --- 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:240b5bcc2bafd450912d2da2be15e62bc6de2cf839823ae4bf94d4f392b451dc -# created: 2023-06-03T21:25:37.968717478Z + digest: sha256:ddf4551385d566771dc713090feb7b4c1164fb8a698fe52bbe7670b24236565b +# created: 2023-06-27T13:04:21.96690344Z diff --git a/noxfile.py b/noxfile.py index 95e58c52..6b57c246 100644 --- a/noxfile.py +++ b/noxfile.py @@ -305,10 +305,9 @@ def docfx(session): session.install("-e", ".") session.install( - "sphinx==4.0.1", + "gcp-sphinx-docfx-yaml", "alabaster", "recommonmark", - "gcp-sphinx-docfx-yaml", ) shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) From ef8e474307997d141e45d43cd32d49ddd415d65b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 17:30:15 +0000 Subject: [PATCH 5/7] chore: store artifacts in placer [autoapprove] (#504) Source-Link: https://togithub.com/googleapis/synthtool/commit/cb960373d12d20f8dc38beee2bf884d49627165e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:2d816f26f728ac8b24248741e7d4c461c09764ef9f7be3684d557c9632e46dbd --- .github/.OwlBot.lock.yaml | 4 ++-- .kokoro/release/common.cfg | 9 +++++++++ noxfile.py | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 1b3cb6c5..98994f47 100644 --- 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:ddf4551385d566771dc713090feb7b4c1164fb8a698fe52bbe7670b24236565b -# created: 2023-06-27T13:04:21.96690344Z + digest: sha256:2d816f26f728ac8b24248741e7d4c461c09764ef9f7be3684d557c9632e46dbd +# created: 2023-06-28T17:03:33.371210701Z diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg index 28658228..63aeffb7 100644 --- a/.kokoro/release/common.cfg +++ b/.kokoro/release/common.cfg @@ -38,3 +38,12 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" } + +# Store the packages we uploaded to PyPI. That way, we have a record of exactly +# what we published, which we can use to generate SBOMs and attestations. +action { + define_artifacts { + regex: "github/python-dlp/**/*.tar.gz" + strip_prefix: "github/python-dlp" + } +} diff --git a/noxfile.py b/noxfile.py index 6b57c246..7d411fea 100644 --- a/noxfile.py +++ b/noxfile.py @@ -379,6 +379,7 @@ def prerelease_deps(session): "grpcio!=1.52.0rc1", "grpcio-status", "google-api-core", + "google-auth", "proto-plus", "google-cloud-testutils", # dependencies of google-cloud-testutils" @@ -391,7 +392,6 @@ def prerelease_deps(session): # Remaining dependencies other_deps = [ "requests", - "google-auth", ] session.install(*other_deps) From a4099cca37464c6b94531d327bdfd7ab600f7159 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 15:29:47 -0400 Subject: [PATCH 6/7] fix: Add async context manager return types (#505) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Add async context manager return types chore: Mock return_value should not populate oneof message fields chore: Support snippet generation for services that only support REST transport chore: Update gapic-generator-python to v1.11.0 PiperOrigin-RevId: 545430278 Source-Link: https://github.com/googleapis/googleapis/commit/601b5326107eeb74800b426d1f9933faa233258a Source-Link: https://github.com/googleapis/googleapis-gen/commit/b3f18d0f6560a855022fd058865e7620479d7af9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjNmMThkMGY2NTYwYTg1NTAyMmZkMDU4ODY1ZTc2MjA0NzlkN2FmOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Add workaround for b/275029141 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot Co-authored-by: Anthonios Partheniou --- .../services/dlp_service/async_client.py | 2 +- google/cloud/dlp_v2/types/storage.py | 77 ++++-------- noxfile.py | 1 - owlbot.py | 7 ++ ...nippet_metadata_google.privacy.dlp.v2.json | 2 +- tests/unit/gapic/dlp_v2/test_dlp_service.py | 114 +++--------------- 6 files changed, 55 insertions(+), 148 deletions(-) diff --git a/google/cloud/dlp_v2/services/dlp_service/async_client.py b/google/cloud/dlp_v2/services/dlp_service/async_client.py index 54191deb..9539c767 100644 --- a/google/cloud/dlp_v2/services/dlp_service/async_client.py +++ b/google/cloud/dlp_v2/services/dlp_service/async_client.py @@ -4238,7 +4238,7 @@ async def sample_finish_dlp_job(): metadata=metadata, ) - async def __aenter__(self): + async def __aenter__(self) -> "DlpServiceAsyncClient": return self async def __aexit__(self, exc_type, exc, tb): diff --git a/google/cloud/dlp_v2/types/storage.py b/google/cloud/dlp_v2/types/storage.py index 96e83e5e..745d30c9 100644 --- a/google/cloud/dlp_v2/types/storage.py +++ b/google/cloud/dlp_v2/types/storage.py @@ -94,71 +94,46 @@ class FileType(proto.Enum): storage scan. TEXT_FILE (2): Included file extensions: - - :: - - asc,asp, aspx, brf, c, cc,cfm, cgi, cpp, csv, cxx, c++, cs, css, dart, - dat, dot, eml,, epbub, ged, go, h, hh, hpp, hxx, h++, hs, html, htm, - mkd, markdown, m, ml, mli, perl, pl, plist, pm, php, phtml, pht, - properties, py, pyw, rb, rbw, rs, rss, rc, scala, sh, sql, swift, tex, - shtml, shtm, xhtml, lhs, ics, ini, java, js, json, kix, kml, ocaml, md, - txt, text, tsv, vb, vcard, vcs, wml, xcodeproj, xml, xsl, xsd, yml, yaml. + asc,asp, aspx, brf, c, cc,cfm, cgi, cpp, csv, + cxx, c++, cs, css, dart, dat, dot, eml,, + epbub, ged, go, h, hh, hpp, hxx, h++, hs, html, + htm, mkd, markdown, m, ml, mli, perl, pl, + plist, pm, php, phtml, pht, properties, py, + pyw, rb, rbw, rs, rss, rc, scala, sh, sql, + swift, tex, shtml, shtm, xhtml, lhs, ics, ini, + java, js, json, kix, kml, ocaml, md, txt, + text, tsv, vb, vcard, vcs, wml, xcodeproj, xml, + xsl, xsd, yml, yaml. IMAGE (3): - Included file extensions: - - :: - - bmp, gif, jpg, jpeg, jpe, png. - + Included file extensions: bmp, gif, jpg, jpeg, jpe, png. bytes_limit_per_file has no effect on image files. Image inspection is restricted to 'global', 'us', 'asia', and 'europe'. WORD (5): - Word files >30 MB will be scanned as binary files. Included - file extensions: - - :: - - docx, dotx, docm, dotm + Word files >30 MB will be scanned as binary + files. Included file extensions: + docx, dotx, docm, dotm PDF (6): - PDF files >30 MB will be scanned as binary files. Included - file extensions: - - :: - - pdf + PDF files >30 MB will be scanned as binary + files. Included file extensions: + pdf AVRO (7): Included file extensions: - - :: - - avro + avro CSV (8): Included file extensions: - - :: - - csv + csv TSV (9): Included file extensions: - - :: - - tsv + tsv POWERPOINT (11): - Powerpoint files >30 MB will be scanned as binary files. - Included file extensions: - - :: - - pptx, pptm, potx, potm, pot + Powerpoint files >30 MB will be scanned as + binary files. Included file extensions: + pptx, pptm, potx, potm, pot EXCEL (12): - Excel files >30 MB will be scanned as binary files. Included - file extensions: - - :: - - xlsx, xlsm, xltx, xltm + Excel files >30 MB will be scanned as binary + files. Included file extensions: + xlsx, xlsm, xltx, xltm """ FILE_TYPE_UNSPECIFIED = 0 BINARY_FILE = 1 diff --git a/noxfile.py b/noxfile.py index 7d411fea..69409034 100644 --- a/noxfile.py +++ b/noxfile.py @@ -287,7 +287,6 @@ def docs(session): shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( "sphinx-build", - "-W", # warnings as errors "-T", # show full traceback on exception "-N", # no colors "-b", diff --git a/owlbot.py b/owlbot.py index ce738f01..88669f7f 100644 --- a/owlbot.py +++ b/owlbot.py @@ -51,6 +51,13 @@ python.py_samples(skip_readmes=True) +# ignore docs warnings (only fail on errors). See b/275029141 +s.replace( + 'noxfile.py', + '"-W", # warnings as errors', + '' +) + # run format session for all directories which have a noxfile for noxfile in Path(".").glob("**/noxfile.py"): s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False) diff --git a/samples/generated_samples/snippet_metadata_google.privacy.dlp.v2.json b/samples/generated_samples/snippet_metadata_google.privacy.dlp.v2.json index 8cd42196..956f9eab 100644 --- a/samples/generated_samples/snippet_metadata_google.privacy.dlp.v2.json +++ b/samples/generated_samples/snippet_metadata_google.privacy.dlp.v2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dlp", - "version": "3.12.1" + "version": "0.1.0" }, "snippets": [ { diff --git a/tests/unit/gapic/dlp_v2/test_dlp_service.py b/tests/unit/gapic/dlp_v2/test_dlp_service.py index 062e0fe9..f0f2eed5 100644 --- a/tests/unit/gapic/dlp_v2/test_dlp_service.py +++ b/tests/unit/gapic/dlp_v2/test_dlp_service.py @@ -2674,9 +2674,11 @@ async def test_list_inspect_templates_async_pages(): RuntimeError, ) pages = [] - async for page_ in ( + # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` + # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 + async for page_ in ( # pragma: no branch await client.list_inspect_templates(request={}) - ).pages: # pragma: no branch + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -4142,9 +4144,11 @@ async def test_list_deidentify_templates_async_pages(): RuntimeError, ) pages = [] - async for page_ in ( + # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` + # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 + async for page_ in ( # pragma: no branch await client.list_deidentify_templates(request={}) - ).pages: # pragma: no branch + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -4411,13 +4415,6 @@ def test_create_job_trigger(request_type, transport: str = "grpc"): display_name="display_name_value", description="description_value", status=dlp.JobTrigger.Status.HEALTHY, - inspect_job=dlp.InspectJobConfig( - storage_config=storage.StorageConfig( - datastore_options=storage.DatastoreOptions( - partition_id=storage.PartitionId(project_id="project_id_value") - ) - ) - ), ) response = client.create_job_trigger(request) @@ -4682,13 +4679,6 @@ def test_update_job_trigger(request_type, transport: str = "grpc"): display_name="display_name_value", description="description_value", status=dlp.JobTrigger.Status.HEALTHY, - inspect_job=dlp.InspectJobConfig( - storage_config=storage.StorageConfig( - datastore_options=storage.DatastoreOptions( - partition_id=storage.PartitionId(project_id="project_id_value") - ) - ) - ), ) response = client.update_job_trigger(request) @@ -5201,13 +5191,6 @@ def test_get_job_trigger(request_type, transport: str = "grpc"): display_name="display_name_value", description="description_value", status=dlp.JobTrigger.Status.HEALTHY, - inspect_job=dlp.InspectJobConfig( - storage_config=storage.StorageConfig( - datastore_options=storage.DatastoreOptions( - partition_id=storage.PartitionId(project_id="project_id_value") - ) - ) - ), ) response = client.get_job_trigger(request) @@ -5857,9 +5840,11 @@ async def test_list_job_triggers_async_pages(): RuntimeError, ) pages = [] - async for page_ in ( + # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` + # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 + async for page_ in ( # pragma: no branch await client.list_job_triggers(request={}) - ).pages: # pragma: no branch + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -6126,13 +6111,6 @@ def test_activate_job_trigger(request_type, transport: str = "grpc"): type_=dlp.DlpJobType.INSPECT_JOB, state=dlp.DlpJob.JobState.PENDING, job_trigger_name="job_trigger_name_value", - risk_details=dlp.AnalyzeDataSourceRiskDetails( - requested_privacy_metric=dlp.PrivacyMetric( - numerical_stats_config=dlp.PrivacyMetric.NumericalStatsConfig( - field=storage.FieldId(name="name_value") - ) - ) - ), ) response = client.activate_job_trigger(request) @@ -6301,13 +6279,6 @@ def test_create_dlp_job(request_type, transport: str = "grpc"): type_=dlp.DlpJobType.INSPECT_JOB, state=dlp.DlpJob.JobState.PENDING, job_trigger_name="job_trigger_name_value", - risk_details=dlp.AnalyzeDataSourceRiskDetails( - requested_privacy_metric=dlp.PrivacyMetric( - numerical_stats_config=dlp.PrivacyMetric.NumericalStatsConfig( - field=storage.FieldId(name="name_value") - ) - ) - ), ) response = client.create_dlp_job(request) @@ -7005,9 +6976,11 @@ async def test_list_dlp_jobs_async_pages(): RuntimeError, ) pages = [] - async for page_ in ( + # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` + # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 + async for page_ in ( # pragma: no branch await client.list_dlp_jobs(request={}) - ).pages: # pragma: no branch + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -7038,13 +7011,6 @@ def test_get_dlp_job(request_type, transport: str = "grpc"): type_=dlp.DlpJobType.INSPECT_JOB, state=dlp.DlpJob.JobState.PENDING, job_trigger_name="job_trigger_name_value", - risk_details=dlp.AnalyzeDataSourceRiskDetails( - requested_privacy_metric=dlp.PrivacyMetric( - numerical_stats_config=dlp.PrivacyMetric.NumericalStatsConfig( - field=storage.FieldId(name="name_value") - ) - ) - ), ) response = client.get_dlp_job(request) @@ -8810,9 +8776,11 @@ async def test_list_stored_info_types_async_pages(): RuntimeError, ) pages = [] - async for page_ in ( + # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch` + # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372 + async for page_ in ( # pragma: no branch await client.list_stored_info_types(request={}) - ).pages: # pragma: no branch + ).pages: pages.append(page_) for page_, token in zip(pages, ["abc", "def", "ghi", ""]): assert page_.raw_page.next_page_token == token @@ -13051,13 +13019,6 @@ def test_create_job_trigger_rest(request_type): display_name="display_name_value", description="description_value", status=dlp.JobTrigger.Status.HEALTHY, - inspect_job=dlp.InspectJobConfig( - storage_config=storage.StorageConfig( - datastore_options=storage.DatastoreOptions( - partition_id=storage.PartitionId(project_id="project_id_value") - ) - ) - ), ) # Wrap the value into a proper Response obj @@ -13337,13 +13298,6 @@ def test_update_job_trigger_rest(request_type): display_name="display_name_value", description="description_value", status=dlp.JobTrigger.Status.HEALTHY, - inspect_job=dlp.InspectJobConfig( - storage_config=storage.StorageConfig( - datastore_options=storage.DatastoreOptions( - partition_id=storage.PartitionId(project_id="project_id_value") - ) - ) - ), ) # Wrap the value into a proper Response obj @@ -13885,13 +13839,6 @@ def test_get_job_trigger_rest(request_type): display_name="display_name_value", description="description_value", status=dlp.JobTrigger.Status.HEALTHY, - inspect_job=dlp.InspectJobConfig( - storage_config=storage.StorageConfig( - datastore_options=storage.DatastoreOptions( - partition_id=storage.PartitionId(project_id="project_id_value") - ) - ) - ), ) # Wrap the value into a proper Response obj @@ -14749,13 +14696,6 @@ def test_activate_job_trigger_rest(request_type): type_=dlp.DlpJobType.INSPECT_JOB, state=dlp.DlpJob.JobState.PENDING, job_trigger_name="job_trigger_name_value", - risk_details=dlp.AnalyzeDataSourceRiskDetails( - requested_privacy_metric=dlp.PrivacyMetric( - numerical_stats_config=dlp.PrivacyMetric.NumericalStatsConfig( - field=storage.FieldId(name="name_value") - ) - ) - ), ) # Wrap the value into a proper Response obj @@ -14971,13 +14911,6 @@ def test_create_dlp_job_rest(request_type): type_=dlp.DlpJobType.INSPECT_JOB, state=dlp.DlpJob.JobState.PENDING, job_trigger_name="job_trigger_name_value", - risk_details=dlp.AnalyzeDataSourceRiskDetails( - requested_privacy_metric=dlp.PrivacyMetric( - numerical_stats_config=dlp.PrivacyMetric.NumericalStatsConfig( - field=storage.FieldId(name="name_value") - ) - ) - ), ) # Wrap the value into a proper Response obj @@ -15599,13 +15532,6 @@ def test_get_dlp_job_rest(request_type): type_=dlp.DlpJobType.INSPECT_JOB, state=dlp.DlpJob.JobState.PENDING, job_trigger_name="job_trigger_name_value", - risk_details=dlp.AnalyzeDataSourceRiskDetails( - requested_privacy_metric=dlp.PrivacyMetric( - numerical_stats_config=dlp.PrivacyMetric.NumericalStatsConfig( - field=storage.FieldId(name="name_value") - ) - ) - ), ) # Wrap the value into a proper Response obj From 8874dc3cb97b549748639ebc04af7b3f1503a43f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:47:07 -0400 Subject: [PATCH 7/7] chore(main): release 3.12.2 (#506) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 7 +++++++ google/cloud/dlp/gapic_version.py | 2 +- google/cloud/dlp_v2/gapic_version.py | 2 +- .../snippet_metadata_google.privacy.dlp.v2.json | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 40befa07..0e5ac191 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "3.12.1" + ".": "3.12.2" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 770f93fe..cfd08bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-dlp/#history +## [3.12.2](https://github.com/googleapis/python-dlp/compare/v3.12.1...v3.12.2) (2023-07-04) + + +### Bug Fixes + +* Add async context manager return types ([#505](https://github.com/googleapis/python-dlp/issues/505)) ([a4099cc](https://github.com/googleapis/python-dlp/commit/a4099cca37464c6b94531d327bdfd7ab600f7159)) + ## [3.12.1](https://github.com/googleapis/python-dlp/compare/v3.12.0...v3.12.1) (2023-03-23) diff --git a/google/cloud/dlp/gapic_version.py b/google/cloud/dlp/gapic_version.py index 14833215..d4230f9e 100644 --- a/google/cloud/dlp/gapic_version.py +++ b/google/cloud/dlp/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "3.12.1" # {x-release-please-version} +__version__ = "3.12.2" # {x-release-please-version} diff --git a/google/cloud/dlp_v2/gapic_version.py b/google/cloud/dlp_v2/gapic_version.py index 14833215..d4230f9e 100644 --- a/google/cloud/dlp_v2/gapic_version.py +++ b/google/cloud/dlp_v2/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "3.12.1" # {x-release-please-version} +__version__ = "3.12.2" # {x-release-please-version} diff --git a/samples/generated_samples/snippet_metadata_google.privacy.dlp.v2.json b/samples/generated_samples/snippet_metadata_google.privacy.dlp.v2.json index 956f9eab..87e01a12 100644 --- a/samples/generated_samples/snippet_metadata_google.privacy.dlp.v2.json +++ b/samples/generated_samples/snippet_metadata_google.privacy.dlp.v2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-dlp", - "version": "0.1.0" + "version": "3.12.2" }, "snippets": [ { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy