From 83f704506df923b4fa79b24cf00e0c97ead18e92 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 Oct 2022 15:23:53 +0200 Subject: [PATCH 01/11] chore(deps): update dependency google-cloud-tasks to v2.10.4 (#311) --- samples/snippets/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index a120d6cc..1bbf5163 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1 +1 @@ -google-cloud-tasks==2.10.3 +google-cloud-tasks==2.10.4 From 0d8581c6f68a3acf604e766b8f967a4d3d51bd62 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 Oct 2022 12:56:35 +0200 Subject: [PATCH 02/11] chore(deps): update dependency pytest to v7.2.0 (#312) --- samples/snippets/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/requirements-test.txt b/samples/snippets/requirements-test.txt index e0716850..49780e03 100644 --- a/samples/snippets/requirements-test.txt +++ b/samples/snippets/requirements-test.txt @@ -1 +1 @@ -pytest==7.1.3 +pytest==7.2.0 From e4d881165b5193d3cf345a581b62d9e30fe0dce1 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 02:12:35 +0000 Subject: [PATCH 03/11] chore(python): update dependencies in .kokoro/requirements.txt [autoapprove] (#314) Source-Link: https://togithub.com/googleapis/synthtool/commit/e3a1277ac35fc88c09db1930533e24292b132ced Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:452901c74a22f9b9a3bd02bce780b8e8805c97270d424684bff809ce5be8c2a2 --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/requirements.txt | 325 +++++++++++++++++++++----------------- noxfile.py | 11 +- 3 files changed, 187 insertions(+), 151 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 3815c983..12edee77 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:7a40313731a7cb1454eef6b33d3446ebb121836738dc3ab3d2d3ded5268c35b6 + digest: sha256:452901c74a22f9b9a3bd02bce780b8e8805c97270d424684bff809ce5be8c2a2 diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index d15994ba..31425f16 100644 --- 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.6.15 \ - --hash=sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d \ - --hash=sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412 +certifi==2022.9.24 \ + --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \ + --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ @@ -110,29 +110,33 @@ commonmark==0.9.1 \ --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \ --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9 # via rich -cryptography==37.0.4 \ - --hash=sha256:190f82f3e87033821828f60787cfa42bff98404483577b591429ed99bed39d59 \ - --hash=sha256:2be53f9f5505673eeda5f2736bea736c40f051a739bfae2f92d18aed1eb54596 \ - --hash=sha256:30788e070800fec9bbcf9faa71ea6d8068f5136f60029759fd8c3efec3c9dcb3 \ - --hash=sha256:3d41b965b3380f10e4611dbae366f6dc3cefc7c9ac4e8842a806b9672ae9add5 \ - --hash=sha256:4c590ec31550a724ef893c50f9a97a0c14e9c851c85621c5650d699a7b88f7ab \ - --hash=sha256:549153378611c0cca1042f20fd9c5030d37a72f634c9326e225c9f666d472884 \ - --hash=sha256:63f9c17c0e2474ccbebc9302ce2f07b55b3b3fcb211ded18a42d5764f5c10a82 \ - --hash=sha256:6bc95ed67b6741b2607298f9ea4932ff157e570ef456ef7ff0ef4884a134cc4b \ - --hash=sha256:7099a8d55cd49b737ffc99c17de504f2257e3787e02abe6d1a6d136574873441 \ - --hash=sha256:75976c217f10d48a8b5a8de3d70c454c249e4b91851f6838a4e48b8f41eb71aa \ - --hash=sha256:7bc997818309f56c0038a33b8da5c0bfbb3f1f067f315f9abd6fc07ad359398d \ - --hash=sha256:80f49023dd13ba35f7c34072fa17f604d2f19bf0989f292cedf7ab5770b87a0b \ - --hash=sha256:91ce48d35f4e3d3f1d83e29ef4a9267246e6a3be51864a5b7d2247d5086fa99a \ - --hash=sha256:a958c52505c8adf0d3822703078580d2c0456dd1d27fabfb6f76fe63d2971cd6 \ - --hash=sha256:b62439d7cd1222f3da897e9a9fe53bbf5c104fff4d60893ad1355d4c14a24157 \ - --hash=sha256:b7f8dd0d4c1f21759695c05a5ec8536c12f31611541f8904083f3dc582604280 \ - --hash=sha256:d204833f3c8a33bbe11eda63a54b1aad7aa7456ed769a982f21ec599ba5fa282 \ - --hash=sha256:e007f052ed10cc316df59bc90fbb7ff7950d7e2919c9757fd42a2b8ecf8a5f67 \ - --hash=sha256:f2dcb0b3b63afb6df7fd94ec6fbddac81b5492513f7b0436210d390c14d46ee8 \ - --hash=sha256:f721d1885ecae9078c3f6bbe8a88bc0786b6e749bf32ccec1ef2b18929a05046 \ - --hash=sha256:f7a6de3e98771e183645181b3627e2563dcde3ce94a9e42a3f427d2255190327 \ - --hash=sha256:f8c0a6e9e1dd3eb0414ba320f85da6b0dcbd543126e30fcc546e7372a7fbf3b9 +cryptography==38.0.3 \ + --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \ + --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \ + --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \ + --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \ + --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \ + --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \ + --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \ + --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \ + --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \ + --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \ + --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \ + --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \ + --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \ + --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \ + --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \ + --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \ + --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \ + --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \ + --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \ + --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \ + --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \ + --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \ + --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \ + --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \ + --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ + --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 # via # gcp-releasetool # secretstorage @@ -148,23 +152,23 @@ filelock==3.8.0 \ --hash=sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc \ --hash=sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4 # via virtualenv -gcp-docuploader==0.6.3 \ - --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ - --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b +gcp-docuploader==0.6.4 \ + --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ + --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in -gcp-releasetool==1.8.7 \ - --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \ - --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d +gcp-releasetool==1.9.1 \ + --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ + --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b # via -r requirements.in -google-api-core==2.8.2 \ - --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ - --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 +google-api-core==2.10.2 \ + --hash=sha256:10c06f7739fe57781f87523375e8e1a3a4674bf6392cd6131a3222182b971320 \ + --hash=sha256:34f24bd1d5f72a8c4519773d99ca6bf080a6c4e041b4e9f024fe230191dda62e # via # google-cloud-core # google-cloud-storage -google-auth==2.11.0 \ - --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \ - --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb +google-auth==2.14.0 \ + --hash=sha256:1ad5b0e6eba5f69645971abb3d2c197537d5914070a8c6d30299dfdb07c5c700 \ + --hash=sha256:cf24817855d874ede2efd071aa22125445f555de1685b739a9782fcf408c2a3d # via # gcp-releasetool # google-api-core @@ -178,72 +182,97 @@ google-cloud-storage==2.5.0 \ --hash=sha256:19a26c66c317ce542cea0830b7e787e8dac2588b6bfa4d3fd3b871ba16305ab0 \ --hash=sha256:382f34b91de2212e3c2e7b40ec079d27ee2e3dbbae99b75b1bcd8c63063ce235 # via gcp-docuploader -google-crc32c==1.3.0 \ - --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ - --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ - --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \ - --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \ - --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \ - --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \ - --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \ - --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \ - --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \ - --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \ - --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \ - --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \ - --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \ - --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \ - --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \ - --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \ - --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \ - --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \ - --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \ - --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \ - --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \ - --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \ - --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \ - --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \ - --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \ - --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \ - --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \ - --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \ - --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \ - --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \ - --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \ - --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \ - --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \ - --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \ - --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \ - --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \ - --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \ - --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \ - --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \ - --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \ - --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ - --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ - --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 +google-crc32c==1.5.0 \ + --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ + --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \ + --hash=sha256:02ebb8bf46c13e36998aeaad1de9b48f4caf545e91d14041270d9dca767b780c \ + --hash=sha256:07eb3c611ce363c51a933bf6bd7f8e3878a51d124acfc89452a75120bc436289 \ + --hash=sha256:1034d91442ead5a95b5aaef90dbfaca8633b0247d1e41621d1e9f9db88c36298 \ + --hash=sha256:116a7c3c616dd14a3de8c64a965828b197e5f2d121fedd2f8c5585c547e87b02 \ + --hash=sha256:19e0a019d2c4dcc5e598cd4a4bc7b008546b0358bd322537c74ad47a5386884f \ + --hash=sha256:1c7abdac90433b09bad6c43a43af253e688c9cfc1c86d332aed13f9a7c7f65e2 \ + --hash=sha256:1e986b206dae4476f41bcec1faa057851f3889503a70e1bdb2378d406223994a \ + --hash=sha256:272d3892a1e1a2dbc39cc5cde96834c236d5327e2122d3aaa19f6614531bb6eb \ + --hash=sha256:278d2ed7c16cfc075c91378c4f47924c0625f5fc84b2d50d921b18b7975bd210 \ + --hash=sha256:2ad40e31093a4af319dadf503b2467ccdc8f67c72e4bcba97f8c10cb078207b5 \ + --hash=sha256:2e920d506ec85eb4ba50cd4228c2bec05642894d4c73c59b3a2fe20346bd00ee \ + --hash=sha256:3359fc442a743e870f4588fcf5dcbc1bf929df1fad8fb9905cd94e5edb02e84c \ + --hash=sha256:37933ec6e693e51a5b07505bd05de57eee12f3e8c32b07da7e73669398e6630a \ + --hash=sha256:398af5e3ba9cf768787eef45c803ff9614cc3e22a5b2f7d7ae116df8b11e3314 \ + --hash=sha256:3b747a674c20a67343cb61d43fdd9207ce5da6a99f629c6e2541aa0e89215bcd \ + --hash=sha256:461665ff58895f508e2866824a47bdee72497b091c730071f2b7575d5762ab65 \ + --hash=sha256:4c6fdd4fccbec90cc8a01fc00773fcd5fa28db683c116ee3cb35cd5da9ef6c37 \ + --hash=sha256:5829b792bf5822fd0a6f6eb34c5f81dd074f01d570ed7f36aa101d6fc7a0a6e4 \ + --hash=sha256:596d1f98fc70232fcb6590c439f43b350cb762fb5d61ce7b0e9db4539654cc13 \ + --hash=sha256:5ae44e10a8e3407dbe138984f21e536583f2bba1be9491239f942c2464ac0894 \ + --hash=sha256:635f5d4dd18758a1fbd1049a8e8d2fee4ffed124462d837d1a02a0e009c3ab31 \ + --hash=sha256:64e52e2b3970bd891309c113b54cf0e4384762c934d5ae56e283f9a0afcd953e \ + --hash=sha256:66741ef4ee08ea0b2cc3c86916ab66b6aef03768525627fd6a1b34968b4e3709 \ + --hash=sha256:67b741654b851abafb7bc625b6d1cdd520a379074e64b6a128e3b688c3c04740 \ + --hash=sha256:6ac08d24c1f16bd2bf5eca8eaf8304812f44af5cfe5062006ec676e7e1d50afc \ + --hash=sha256:6f998db4e71b645350b9ac28a2167e6632c239963ca9da411523bb439c5c514d \ + --hash=sha256:72218785ce41b9cfd2fc1d6a017dc1ff7acfc4c17d01053265c41a2c0cc39b8c \ + --hash=sha256:74dea7751d98034887dbd821b7aae3e1d36eda111d6ca36c206c44478035709c \ + --hash=sha256:759ce4851a4bb15ecabae28f4d2e18983c244eddd767f560165563bf9aefbc8d \ + --hash=sha256:77e2fd3057c9d78e225fa0a2160f96b64a824de17840351b26825b0848022906 \ + --hash=sha256:7c074fece789b5034b9b1404a1f8208fc2d4c6ce9decdd16e8220c5a793e6f61 \ + --hash=sha256:7c42c70cd1d362284289c6273adda4c6af8039a8ae12dc451dcd61cdabb8ab57 \ + --hash=sha256:7f57f14606cd1dd0f0de396e1e53824c371e9544a822648cd76c034d209b559c \ + --hash=sha256:83c681c526a3439b5cf94f7420471705bbf96262f49a6fe546a6db5f687a3d4a \ + --hash=sha256:8485b340a6a9e76c62a7dce3c98e5f102c9219f4cfbf896a00cf48caf078d438 \ + --hash=sha256:84e6e8cd997930fc66d5bb4fde61e2b62ba19d62b7abd7a69920406f9ecca946 \ + --hash=sha256:89284716bc6a5a415d4eaa11b1726d2d60a0cd12aadf5439828353662ede9dd7 \ + --hash=sha256:8b87e1a59c38f275c0e3676fc2ab6d59eccecfd460be267ac360cc31f7bcde96 \ + --hash=sha256:8f24ed114432de109aa9fd317278518a5af2d31ac2ea6b952b2f7782b43da091 \ + --hash=sha256:98cb4d057f285bd80d8778ebc4fde6b4d509ac3f331758fb1528b733215443ae \ + --hash=sha256:998679bf62b7fb599d2878aa3ed06b9ce688b8974893e7223c60db155f26bd8d \ + --hash=sha256:9ba053c5f50430a3fcfd36f75aff9caeba0440b2d076afdb79a318d6ca245f88 \ + --hash=sha256:9c99616c853bb585301df6de07ca2cadad344fd1ada6d62bb30aec05219c45d2 \ + --hash=sha256:a1fd716e7a01f8e717490fbe2e431d2905ab8aa598b9b12f8d10abebb36b04dd \ + --hash=sha256:a2355cba1f4ad8b6988a4ca3feed5bff33f6af2d7f134852cf279c2aebfde541 \ + --hash=sha256:b1f8133c9a275df5613a451e73f36c2aea4fe13c5c8997e22cf355ebd7bd0728 \ + --hash=sha256:b8667b48e7a7ef66afba2c81e1094ef526388d35b873966d8a9a447974ed9178 \ + --hash=sha256:ba1eb1843304b1e5537e1fca632fa894d6f6deca8d6389636ee5b4797affb968 \ + --hash=sha256:be82c3c8cfb15b30f36768797a640e800513793d6ae1724aaaafe5bf86f8f346 \ + --hash=sha256:c02ec1c5856179f171e032a31d6f8bf84e5a75c45c33b2e20a3de353b266ebd8 \ + --hash=sha256:c672d99a345849301784604bfeaeba4db0c7aae50b95be04dd651fd2a7310b93 \ + --hash=sha256:c6c777a480337ac14f38564ac88ae82d4cd238bf293f0a22295b66eb89ffced7 \ + --hash=sha256:cae0274952c079886567f3f4f685bcaf5708f0a23a5f5216fdab71f81a6c0273 \ + --hash=sha256:cd67cf24a553339d5062eff51013780a00d6f97a39ca062781d06b3a73b15462 \ + --hash=sha256:d3515f198eaa2f0ed49f8819d5732d70698c3fa37384146079b3799b97667a94 \ + --hash=sha256:d5280312b9af0976231f9e317c20e4a61cd2f9629b7bfea6a693d1878a264ebd \ + --hash=sha256:de06adc872bcd8c2a4e0dc51250e9e65ef2ca91be023b9d13ebd67c2ba552e1e \ + --hash=sha256:e1674e4307fa3024fc897ca774e9c7562c957af85df55efe2988ed9056dc4e57 \ + --hash=sha256:e2096eddb4e7c7bdae4bd69ad364e55e07b8316653234a56552d9c988bd2d61b \ + --hash=sha256:e560628513ed34759456a416bf86b54b2476c59144a9138165c9a1575801d0d9 \ + --hash=sha256:edfedb64740750e1a3b16152620220f51d58ff1b4abceb339ca92e934775c27a \ + --hash=sha256:f13cae8cc389a440def0c8c52057f37359014ccbc9dc1f0827936bcd367c6100 \ + --hash=sha256:f314013e7dcd5cf45ab1945d92e713eec788166262ae8deb2cfacd53def27325 \ + --hash=sha256:f583edb943cf2e09c60441b910d6a20b4d9d626c75a36c8fcac01a6c96c01183 \ + --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \ + --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4 # via google-resumable-media -google-resumable-media==2.3.3 \ - --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ - --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 +google-resumable-media==2.4.0 \ + --hash=sha256:2aa004c16d295c8f6c33b2b4788ba59d366677c0a25ae7382436cb30f776deaa \ + --hash=sha256:8d5518502f92b9ecc84ac46779bd4f09694ecb3ba38a3e7ca737a86d15cbca1f # via google-cloud-storage googleapis-common-protos==1.56.4 \ --hash=sha256:8eb2cbc91b69feaf23e32452a7ae60e791e09967d81d4fcc7fc388182d1bd394 \ --hash=sha256:c25873c47279387cfdcbdafa36149887901d36202cb645a0e4f29686bf6e4417 # via google-api-core -idna==3.3 \ - --hash=sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff \ - --hash=sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d +idna==3.4 \ + --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ + --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 # via requests -importlib-metadata==4.12.0 \ - --hash=sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670 \ - --hash=sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23 +importlib-metadata==5.0.0 \ + --hash=sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab \ + --hash=sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43 # via # -r requirements.in # twine -jaraco-classes==3.2.2 \ - --hash=sha256:6745f113b0b588239ceb49532aa09c3ebb947433ce311ef2f8e3ad64ebb74594 \ - --hash=sha256:e6ef6fd3fcf4579a7a019d87d1e56a883f4e4c35cfe925f86731abc58804e647 +jaraco-classes==3.2.3 \ + --hash=sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158 \ + --hash=sha256:89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a # via keyring jeepney==0.8.0 \ --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ @@ -255,9 +284,9 @@ jinja2==3.1.2 \ --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 # via gcp-releasetool -keyring==23.9.0 \ - --hash=sha256:4c32a31174faaee48f43a7e2c7e9c3216ec5e95acf22a2bebfb4a1d05056ee44 \ - --hash=sha256:98f060ec95ada2ab910c195a2d4317be6ef87936a766b239c46aa3c7aac4f0db +keyring==23.9.3 \ + --hash=sha256:69732a15cb1433bdfbc3b980a8a36a04878a6cfd7cb99f497b573f31618001c0 \ + --hash=sha256:69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5 # via # gcp-releasetool # twine @@ -303,9 +332,9 @@ markupsafe==2.1.1 \ --hash=sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a \ --hash=sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7 # via jinja2 -more-itertools==8.14.0 \ - --hash=sha256:1bc4f91ee5b1b31ac7ceacc17c09befe6a40a503907baf9c839c229b5095cfd2 \ - --hash=sha256:c09443cd3d5438b8dafccd867a6bc1cb0894389e90cb53d227456b0b0bccb750 +more-itertools==9.0.0 \ + --hash=sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 \ + --hash=sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab # via jaraco-classes nox==2022.8.7 \ --hash=sha256:1b894940551dc5c389f9271d197ca5d655d40bdc6ccf93ed6880e4042760a34b \ @@ -325,34 +354,34 @@ platformdirs==2.5.2 \ --hash=sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788 \ --hash=sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19 # via virtualenv -protobuf==3.20.2 \ - --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \ - --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \ - --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \ - --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \ - --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \ - --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \ - --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \ - --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \ - --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \ - --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \ - --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \ - --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \ - --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \ - --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \ - --hash=sha256:9f876a69ca55aed879b43c295a328970306e8e80a263ec91cf6e9189243c613b \ - --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \ - --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \ - --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \ - --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \ - --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \ - --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \ - --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \ - --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0 +protobuf==3.20.3 \ + --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \ + --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \ + --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \ + --hash=sha256:398a9e0c3eaceb34ec1aee71894ca3299605fa8e761544934378bbc6c97de23b \ + --hash=sha256:44246bab5dd4b7fbd3c0c80b6f16686808fab0e4aca819ade6e8d294a29c7050 \ + --hash=sha256:447d43819997825d4e71bf5769d869b968ce96848b6479397e29fc24c4a5dfe9 \ + --hash=sha256:67a3598f0a2dcbc58d02dd1928544e7d88f764b47d4a286202913f0b2801c2e7 \ + --hash=sha256:74480f79a023f90dc6e18febbf7b8bac7508420f2006fabd512013c0c238f454 \ + --hash=sha256:819559cafa1a373b7096a482b504ae8a857c89593cf3a25af743ac9ecbd23480 \ + --hash=sha256:899dc660cd599d7352d6f10d83c95df430a38b410c1b66b407a6b29265d66469 \ + --hash=sha256:8c0c984a1b8fef4086329ff8dd19ac77576b384079247c770f29cc8ce3afa06c \ + --hash=sha256:9aae4406ea63d825636cc11ffb34ad3379335803216ee3a856787bcf5ccc751e \ + --hash=sha256:a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db \ + --hash=sha256:b6cc7ba72a8850621bfec987cb72623e703b7fe2b9127a161ce61e61558ad905 \ + --hash=sha256:bf01b5720be110540be4286e791db73f84a2b721072a3711efff6c324cdf074b \ + --hash=sha256:c02ce36ec760252242a33967d51c289fd0e1c0e6e5cc9397e2279177716add86 \ + --hash=sha256:d9e4432ff660d67d775c66ac42a67cf2453c27cb4d738fc22cb53b5d84c135d4 \ + --hash=sha256:daa564862dd0d39c00f8086f88700fdbe8bc717e993a21e90711acfed02f2402 \ + --hash=sha256:de78575669dddf6099a8a0f46a27e82a1783c557ccc38ee620ed8cc96d3be7d7 \ + --hash=sha256:e64857f395505ebf3d2569935506ae0dfc4a15cb80dc25261176c784662cdcc4 \ + --hash=sha256:f4bd856d702e5b0d96a00ec6b307b0f51c1982c2bf9c0052cf9019e9a544ba99 \ + --hash=sha256:f4c42102bc82a51108e449cbb32b19b180022941c727bac0cfd50170341f16ee # via # gcp-docuploader # gcp-releasetool # google-api-core + # googleapis-common-protos py==1.11.0 \ --hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 \ --hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378 @@ -377,9 +406,9 @@ pygments==2.13.0 \ # via # readme-renderer # rich -pyjwt==2.4.0 \ - --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ - --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba +pyjwt==2.6.0 \ + --hash=sha256:69285c7e31fc44f68a1feb309e948e0df53259d579295e6cfe2b1792329f05fd \ + --hash=sha256:d83c3d892a77bbb74d3e1a2cfa90afaadb60945205d1095d9221f04466f64c14 # via gcp-releasetool pyparsing==3.0.9 \ --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ @@ -392,9 +421,9 @@ python-dateutil==2.8.2 \ --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 # via gcp-releasetool -readme-renderer==37.0 \ - --hash=sha256:07b7ea234e03e58f77cc222e206e6abb8f4c0435becce5104794ee591f9301c5 \ - --hash=sha256:9fa416704703e509eeb900696751c908ddeb2011319d93700d8f18baff887a69 +readme-renderer==37.3 \ + --hash=sha256:cd653186dfc73055656f090f227f5cb22a046d7f71a841dfa305f55c9a513273 \ + --hash=sha256:f67a16caedfa71eef48a31b39708637a6f4664c4394801a7b0d6432d13907343 # via twine requests==2.28.1 \ --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 \ @@ -405,17 +434,17 @@ requests==2.28.1 \ # google-cloud-storage # requests-toolbelt # twine -requests-toolbelt==0.9.1 \ - --hash=sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f \ - --hash=sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0 +requests-toolbelt==0.10.1 \ + --hash=sha256:18565aa58116d9951ac39baa288d3adb5b3ff975c4f25eee78555d89e8f247f7 \ + --hash=sha256:62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d # via twine rfc3986==2.0.0 \ --hash=sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd \ --hash=sha256:97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c # via twine -rich==12.5.1 \ - --hash=sha256:2eb4e6894cde1e017976d2975ac210ef515d7548bc595ba20e195fb9628acdeb \ - --hash=sha256:63a5c5ce3673d3d5fbbf23cd87e11ab84b6b451436f1b7f19ec54b6bc36ed7ca +rich==12.6.0 \ + --hash=sha256:a4eb26484f2c82589bd9a17c73d32a010b1e29d89f1604cd9bf3a2097b81bb5e \ + --hash=sha256:ba3a3775974105c221d31141f2c116f4fd65c5ceb0698657a11e9f295ec93fd0 # via twine rsa==4.9 \ --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ @@ -437,9 +466,9 @@ twine==4.0.1 \ --hash=sha256:42026c18e394eac3e06693ee52010baa5313e4811d5a11050e7d48436cf41b9e \ --hash=sha256:96b1cf12f7ae611a4a40b6ae8e9570215daff0611828f5fe1f37a16255ab24a0 # via -r requirements.in -typing-extensions==4.3.0 \ - --hash=sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02 \ - --hash=sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6 +typing-extensions==4.4.0 \ + --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ + --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e # via -r requirements.in urllib3==1.26.12 \ --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ @@ -447,9 +476,9 @@ urllib3==1.26.12 \ # via # requests # twine -virtualenv==20.16.4 \ - --hash=sha256:014f766e4134d0008dcaa1f95bafa0fb0f575795d07cae50b1bee514185d6782 \ - --hash=sha256:035ed57acce4ac35c82c9d8802202b0e71adac011a511ff650cbcf9635006a22 +virtualenv==20.16.6 \ + --hash=sha256:186ca84254abcbde98180fd17092f9628c5fe742273c02724972a1d8a2035108 \ + --hash=sha256:530b850b523c6449406dfba859d6345e48ef19b8439606c5d74d7d3c9e14d76e # via nox webencodings==0.5.1 \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ @@ -459,13 +488,13 @@ wheel==0.37.1 \ --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 # via -r requirements.in -zipp==3.8.1 \ - --hash=sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2 \ - --hash=sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009 +zipp==3.10.0 \ + --hash=sha256:4fcb6f278987a6605757302a6e40e896257570d11c51628968ccb2a47e80c6c1 \ + --hash=sha256:7a7262fd930bd3e36c50b9a64897aec3fafff3dfdeec9623ae22b40e93f99bb8 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -setuptools==65.2.0 \ - --hash=sha256:7f4bc85450898a09f76ebf28b72fa25bc7111f6c7d665d514a60bba9c75ef2a9 \ - --hash=sha256:a3ca5857c89f82f5c9410e8508cb32f4872a3bafd4aa7ae122a24ca33bccc750 +setuptools==65.5.0 \ + --hash=sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17 \ + --hash=sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356 # via -r requirements.in diff --git a/noxfile.py b/noxfile.py index ffe9f354..29d02000 100644 --- a/noxfile.py +++ b/noxfile.py @@ -278,7 +278,11 @@ def docs(session): """Build the docs for this library.""" session.install("-e", ".") - session.install("sphinx==4.0.1", "alabaster", "recommonmark") + session.install( + "sphinx==4.0.1", + "alabaster", + "recommonmark", + ) shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( @@ -301,7 +305,10 @@ def docfx(session): session.install("-e", ".") session.install( - "sphinx==4.0.1", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml" + "sphinx==4.0.1", + "alabaster", + "recommonmark", + "gcp-sphinx-docfx-yaml", ) shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) From 239784316012aa14dc7b47816bbae2acc60de3d4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 10:55:40 -0500 Subject: [PATCH 04/11] chore(python): update release script dependencies (#316) Source-Link: https://github.com/googleapis/synthtool/commit/25083af347468dd5f90f69627420f7d452b6c50e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:e6cbd61f1838d9ff6a31436dfc13717f372a7482a82fc1863ca954ec47bff8c8 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/docs.yml | 4 +-- .github/workflows/lint.yml | 2 +- .github/workflows/unittest.yml | 2 +- .kokoro/docker/docs/Dockerfile | 12 +++---- .kokoro/requirements.in | 4 ++- .kokoro/requirements.txt | 61 ++++++++++++++++++---------------- noxfile.py | 4 +-- 8 files changed, 48 insertions(+), 43 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 12edee77..3f1ccc08 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:452901c74a22f9b9a3bd02bce780b8e8805c97270d424684bff809ce5be8c2a2 + digest: sha256:e6cbd61f1838d9ff6a31436dfc13717f372a7482a82fc1863ca954ec47bff8c8 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7092a139..e97d89e4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.9" - name: Install nox run: | python -m pip install --upgrade setuptools pip wheel @@ -28,7 +28,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.9" - name: Install nox run: | python -m pip install --upgrade setuptools pip wheel diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d2aee5b7..16d5a9e9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.8" - name: Install nox run: | python -m pip install --upgrade setuptools pip wheel diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 87ade4d5..23000c05 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.8" - name: Install coverage run: | python -m pip install --upgrade setuptools pip wheel diff --git a/.kokoro/docker/docs/Dockerfile b/.kokoro/docker/docs/Dockerfile index 238b87b9..f8137d0a 100644 --- a/.kokoro/docker/docs/Dockerfile +++ b/.kokoro/docker/docs/Dockerfile @@ -60,16 +60,16 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* \ && rm -f /var/cache/apt/archives/*.deb -###################### Install python 3.8.11 +###################### Install python 3.9.13 -# Download python 3.8.11 -RUN wget https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tgz +# Download python 3.9.13 +RUN wget https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tgz # Extract files -RUN tar -xvf Python-3.8.11.tgz +RUN tar -xvf Python-3.9.13.tgz -# Install python 3.8.11 -RUN ./Python-3.8.11/configure --enable-optimizations +# Install python 3.9.13 +RUN ./Python-3.9.13/configure --enable-optimizations RUN make altinstall ###################### Install pip diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in index 7718391a..cbd7e77f 100644 --- a/.kokoro/requirements.in +++ b/.kokoro/requirements.in @@ -5,4 +5,6 @@ typing-extensions twine wheel setuptools -nox \ No newline at end of file +nox +charset-normalizer<3 +click<8.1.0 diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 31425f16..9c1b9be3 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -93,11 +93,14 @@ cffi==1.15.1 \ charset-normalizer==2.1.1 \ --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \ --hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f - # via requests + # via + # -r requirements.in + # requests click==8.0.4 \ --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb # via + # -r requirements.in # gcp-docuploader # gcp-releasetool colorlog==6.7.0 \ @@ -156,9 +159,9 @@ gcp-docuploader==0.6.4 \ --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in -gcp-releasetool==1.9.1 \ - --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ - --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b +gcp-releasetool==1.10.0 \ + --hash=sha256:72a38ca91b59c24f7e699e9227c90cbe4dd71b789383cb0164b088abae294c83 \ + --hash=sha256:8c7c99320208383d4bb2b808c6880eb7a81424afe7cdba3c8d84b25f4f0e097d # via -r requirements.in google-api-core==2.10.2 \ --hash=sha256:10c06f7739fe57781f87523375e8e1a3a4674bf6392cd6131a3222182b971320 \ @@ -166,9 +169,9 @@ google-api-core==2.10.2 \ # via # google-cloud-core # google-cloud-storage -google-auth==2.14.0 \ - --hash=sha256:1ad5b0e6eba5f69645971abb3d2c197537d5914070a8c6d30299dfdb07c5c700 \ - --hash=sha256:cf24817855d874ede2efd071aa22125445f555de1685b739a9782fcf408c2a3d +google-auth==2.14.1 \ + --hash=sha256:ccaa901f31ad5cbb562615eb8b664b3dd0bf5404a67618e642307f00613eda4d \ + --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016 # via # gcp-releasetool # google-api-core @@ -178,9 +181,9 @@ google-cloud-core==2.3.2 \ --hash=sha256:8417acf6466be2fa85123441696c4badda48db314c607cf1e5d543fa8bdc22fe \ --hash=sha256:b9529ee7047fd8d4bf4a2182de619154240df17fbe60ead399078c1ae152af9a # via google-cloud-storage -google-cloud-storage==2.5.0 \ - --hash=sha256:19a26c66c317ce542cea0830b7e787e8dac2588b6bfa4d3fd3b871ba16305ab0 \ - --hash=sha256:382f34b91de2212e3c2e7b40ec079d27ee2e3dbbae99b75b1bcd8c63063ce235 +google-cloud-storage==2.6.0 \ + --hash=sha256:104ca28ae61243b637f2f01455cc8a05e8f15a2a18ced96cb587241cdd3820f5 \ + --hash=sha256:4ad0415ff61abdd8bb2ae81c1f8f7ec7d91a1011613f2db87c614c550f97bfe9 # via gcp-docuploader google-crc32c==1.5.0 \ --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ @@ -256,9 +259,9 @@ google-resumable-media==2.4.0 \ --hash=sha256:2aa004c16d295c8f6c33b2b4788ba59d366677c0a25ae7382436cb30f776deaa \ --hash=sha256:8d5518502f92b9ecc84ac46779bd4f09694ecb3ba38a3e7ca737a86d15cbca1f # via google-cloud-storage -googleapis-common-protos==1.56.4 \ - --hash=sha256:8eb2cbc91b69feaf23e32452a7ae60e791e09967d81d4fcc7fc388182d1bd394 \ - --hash=sha256:c25873c47279387cfdcbdafa36149887901d36202cb645a0e4f29686bf6e4417 +googleapis-common-protos==1.57.0 \ + --hash=sha256:27a849d6205838fb6cc3c1c21cb9800707a661bb21c6ce7fb13e99eb1f8a0c46 \ + --hash=sha256:a9f4a1d7f6d9809657b7f1316a1aa527f6664891531bcfcc13b6696e685f443c # via google-api-core idna==3.4 \ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ @@ -269,6 +272,7 @@ importlib-metadata==5.0.0 \ --hash=sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43 # via # -r requirements.in + # keyring # twine jaraco-classes==3.2.3 \ --hash=sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158 \ @@ -284,9 +288,9 @@ jinja2==3.1.2 \ --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 # via gcp-releasetool -keyring==23.9.3 \ - --hash=sha256:69732a15cb1433bdfbc3b980a8a36a04878a6cfd7cb99f497b573f31618001c0 \ - --hash=sha256:69b01dd83c42f590250fe7a1f503fc229b14de83857314b1933a3ddbf595c4a5 +keyring==23.11.0 \ + --hash=sha256:3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e \ + --hash=sha256:ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361 # via # gcp-releasetool # twine @@ -350,9 +354,9 @@ pkginfo==1.8.3 \ --hash=sha256:848865108ec99d4901b2f7e84058b6e7660aae8ae10164e015a6dcf5b242a594 \ --hash=sha256:a84da4318dd86f870a9447a8c98340aa06216bfc6f2b7bdc4b8766984ae1867c # via twine -platformdirs==2.5.2 \ - --hash=sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788 \ - --hash=sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19 +platformdirs==2.5.4 \ + --hash=sha256:1006647646d80f16130f052404c6b901e80ee4ed6bef6792e1f238a8969106f7 \ + --hash=sha256:af0276409f9a02373d540bf8480021a048711d572745aef4b7842dad245eba10 # via virtualenv protobuf==3.20.3 \ --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \ @@ -381,7 +385,6 @@ protobuf==3.20.3 \ # gcp-docuploader # gcp-releasetool # google-api-core - # googleapis-common-protos py==1.11.0 \ --hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 \ --hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378 @@ -476,17 +479,17 @@ urllib3==1.26.12 \ # via # requests # twine -virtualenv==20.16.6 \ - --hash=sha256:186ca84254abcbde98180fd17092f9628c5fe742273c02724972a1d8a2035108 \ - --hash=sha256:530b850b523c6449406dfba859d6345e48ef19b8439606c5d74d7d3c9e14d76e +virtualenv==20.16.7 \ + --hash=sha256:8691e3ff9387f743e00f6bb20f70121f5e4f596cae754531f2b3b3a1b1ac696e \ + --hash=sha256:efd66b00386fdb7dbe4822d172303f40cd05e50e01740b19ea42425cbe653e29 # via nox webencodings==0.5.1 \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 # via bleach -wheel==0.37.1 \ - --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a \ - --hash=sha256:e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4 +wheel==0.38.4 \ + --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ + --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 # via -r requirements.in zipp==3.10.0 \ --hash=sha256:4fcb6f278987a6605757302a6e40e896257570d11c51628968ccb2a47e80c6c1 \ @@ -494,7 +497,7 @@ zipp==3.10.0 \ # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -setuptools==65.5.0 \ - --hash=sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17 \ - --hash=sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356 +setuptools==65.5.1 \ + --hash=sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31 \ + --hash=sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f # via -r requirements.in diff --git a/noxfile.py b/noxfile.py index 29d02000..d8440c02 100644 --- a/noxfile.py +++ b/noxfile.py @@ -273,7 +273,7 @@ def cover(session): session.run("coverage", "erase") -@nox.session(python=DEFAULT_PYTHON_VERSION) +@nox.session(python="3.9") def docs(session): """Build the docs for this library.""" @@ -299,7 +299,7 @@ def docs(session): ) -@nox.session(python=DEFAULT_PYTHON_VERSION) +@nox.session(python="3.9") def docfx(session): """Build the docfx yaml files for this library.""" From 545247a9e7c1d6965597ebc2eec325c6153e18af Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 26 Nov 2022 07:52:04 -0500 Subject: [PATCH 05/11] chore(python): drop flake8-import-order in samples noxfile (#318) Source-Link: https://github.com/googleapis/synthtool/commit/6ed3a831cb9ff69ef8a504c353e098ec0192ad93 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:3abfa0f1886adaf0b83f07cb117b24a639ea1cb9cffe56d43280b977033563eb Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- samples/snippets/noxfile.py | 26 +++----------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 3f1ccc08..bb21147e 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:e6cbd61f1838d9ff6a31436dfc13717f372a7482a82fc1863ca954ec47bff8c8 + digest: sha256:3abfa0f1886adaf0b83f07cb117b24a639ea1cb9cffe56d43280b977033563eb diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index c1715136..05770846 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -18,7 +18,7 @@ import os from pathlib import Path import sys -from typing import Callable, Dict, List, Optional +from typing import Callable, Dict, Optional import nox @@ -108,22 +108,6 @@ def get_pytest_env_vars() -> Dict[str, str]: # -def _determine_local_import_names(start_dir: str) -> List[str]: - """Determines all import names that should be considered "local". - - This is used when running the linter to insure that import order is - properly checked. - """ - file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)] - return [ - basename - for basename, extension in file_ext_pairs - if extension == ".py" - or os.path.isdir(os.path.join(start_dir, basename)) - and basename not in ("__pycache__") - ] - - # Linting with flake8. # # We ignore the following rules: @@ -138,7 +122,6 @@ def _determine_local_import_names(start_dir: str) -> List[str]: "--show-source", "--builtin=gettext", "--max-complexity=20", - "--import-order-style=google", "--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py", "--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202", "--max-line-length=88", @@ -148,14 +131,11 @@ def _determine_local_import_names(start_dir: str) -> List[str]: @nox.session def lint(session: nox.sessions.Session) -> None: if not TEST_CONFIG["enforce_type_hints"]: - session.install("flake8", "flake8-import-order") + session.install("flake8") else: - session.install("flake8", "flake8-import-order", "flake8-annotations") + session.install("flake8", "flake8-annotations") - local_names = _determine_local_import_names(".") args = FLAKE8_COMMON_ARGS + [ - "--application-import-names", - ",".join(local_names), ".", ] session.run("flake8", *args) From d51539fc4e6b7b5a3f6f34d014752f3a8989b016 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 26 Nov 2022 10:26:14 -0500 Subject: [PATCH 06/11] chore: Update gapic-generator-python to v1.6.1 (#313) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update to gapic-generator-python 1.5.0 feat: add support for `google.cloud..__version__` PiperOrigin-RevId: 484665853 Source-Link: https://github.com/googleapis/googleapis/commit/8eb249a19db926c2fbc4ecf1dc09c0e521a88b22 Source-Link: https://github.com/googleapis/googleapis-gen/commit/c8aa327b5f478865fc3fd91e3c2768e54e26ad44 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzhhYTMyN2I1ZjQ3ODg2NWZjM2ZkOTFlM2MyNzY4ZTU0ZTI2YWQ0NCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update version in gapic_version.py * add .release-please-manifest.json with correct version * add owlbot.py to exclude generated gapic_version.py * set manifest to true in .github/release-please.yml * add release-please-config.json * chore: Update to gapic-generator-python 1.6.0 feat(python): Add typing to proto.Message based class attributes feat(python): Snippetgen handling of repeated enum field PiperOrigin-RevId: 487326846 Source-Link: https://github.com/googleapis/googleapis/commit/da380c77bb87ba0f752baf07605dd1db30e1f7e1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/61ef5762ee6731a0cbbfea22fd0eecee51ab1c8e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjFlZjU3NjJlZTY3MzFhMGNiYmZlYTIyZmQwZWVjZWU1MWFiMWM4ZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: new APIs added to reflect updates to the filestore service - Add ENTERPRISE Tier - Add snapshot APIs: RevertInstance, ListSnapshots, CreateSnapshot, DeleteSnapshot, UpdateSnapshot - Add multi-share APIs: ListShares, GetShare, CreateShare, DeleteShare, UpdateShare - Add ConnectMode to NetworkConfig (for Private Service Access support) - New status codes (SUSPENDED/SUSPENDING, REVERTING/RESUMING) - Add SuspensionReason (for KMS related suspension) - Add new fields to Instance information: max_capacity_gb, capacity_step_size_gb, max_share_count, capacity_gb, multi_share_enabled PiperOrigin-RevId: 487492758 Source-Link: https://github.com/googleapis/googleapis/commit/5be5981f50322cf0c7388595e0f31ac5d0693469 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ab0e217f560cc2c1afc11441c2eab6b6950efd2b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWIwZTIxN2Y1NjBjYzJjMWFmYzExNDQxYzJlYWI2YjY5NTBlZmQyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update path to snippet metadata json * chore: Update gapic-generator-python to v1.6.1 PiperOrigin-RevId: 488036204 Source-Link: https://github.com/googleapis/googleapis/commit/08f275f5c1c0d99056e1cb68376323414459ee19 Source-Link: https://github.com/googleapis/googleapis-gen/commit/555c0945e60649e38739ae64bc45719cdf72178f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTU1YzA5NDVlNjA2NDllMzg3MzlhZTY0YmM0NTcxOWNkZjcyMTc4ZiJ9 * 🦉 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 --- .github/release-please.yml | 1 + .release-please-manifest.json | 3 + docs/tasks_v2/types.rst | 1 - docs/tasks_v2beta2/types.rst | 1 - docs/tasks_v2beta3/types.rst | 1 - google/cloud/tasks/__init__.py | 4 + google/cloud/tasks/gapic_version.py | 16 ++ google/cloud/tasks_v2/__init__.py | 4 + .../services/cloud_tasks/async_client.py | 154 +++++++------- .../tasks_v2/services/cloud_tasks/client.py | 128 ++++++------ .../services/cloud_tasks/transports/base.py | 2 +- .../services/cloud_tasks/transports/grpc.py | 20 +- .../cloud_tasks/transports/grpc_asyncio.py | 16 +- google/cloud/tasks_v2/types/cloudtasks.py | 64 +++--- google/cloud/tasks_v2/types/queue.py | 34 +-- google/cloud/tasks_v2/types/target.py | 44 ++-- google/cloud/tasks_v2/types/task.py | 32 +-- google/cloud/tasks_v2beta2/__init__.py | 4 + .../services/cloud_tasks/async_client.py | 196 +++++++++--------- .../services/cloud_tasks/client.py | 162 ++++++++------- .../services/cloud_tasks/transports/base.py | 2 +- .../services/cloud_tasks/transports/grpc.py | 20 +- .../cloud_tasks/transports/grpc_asyncio.py | 16 +- .../cloud/tasks_v2beta2/types/cloudtasks.py | 100 ++++----- google/cloud/tasks_v2beta2/types/queue.py | 50 ++--- google/cloud/tasks_v2beta2/types/target.py | 28 +-- google/cloud/tasks_v2beta2/types/task.py | 32 +-- google/cloud/tasks_v2beta3/__init__.py | 4 + .../services/cloud_tasks/async_client.py | 154 +++++++------- .../services/cloud_tasks/client.py | 128 ++++++------ .../services/cloud_tasks/transports/base.py | 2 +- .../services/cloud_tasks/transports/grpc.py | 20 +- .../cloud_tasks/transports/grpc_asyncio.py | 16 +- .../cloud/tasks_v2beta3/types/cloudtasks.py | 68 +++--- google/cloud/tasks_v2beta3/types/queue.py | 52 ++--- google/cloud/tasks_v2beta3/types/target.py | 50 ++--- google/cloud/tasks_v2beta3/types/task.py | 34 +-- owlbot.py | 56 +++++ release-please-config.json | 33 +++ ...ippet_metadata_google.cloud.tasks.v2.json} | 7 +- ..._metadata_google.cloud.tasks.v2beta2.json} | 7 +- ..._metadata_google.cloud.tasks.v2beta3.json} | 7 +- setup.py | 44 ++-- testing/constraints-3.10.txt | 7 + testing/constraints-3.11.txt | 7 + testing/constraints-3.7.txt | 12 +- testing/constraints-3.8.txt | 7 + testing/constraints-3.9.txt | 7 + 48 files changed, 1052 insertions(+), 805 deletions(-) create mode 100644 .release-please-manifest.json create mode 100644 google/cloud/tasks/gapic_version.py create mode 100644 owlbot.py create mode 100644 release-please-config.json rename samples/generated_samples/{snippet_metadata_tasks_v2.json => snippet_metadata_google.cloud.tasks.v2.json} (99%) rename samples/generated_samples/{snippet_metadata_tasks_v2beta2.json => snippet_metadata_google.cloud.tasks.v2beta2.json} (99%) rename samples/generated_samples/{snippet_metadata_tasks_v2beta3.json => snippet_metadata_google.cloud.tasks.v2beta3.json} (99%) diff --git a/.github/release-please.yml b/.github/release-please.yml index 29601ad4..fe749ff6 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,5 +1,6 @@ releaseType: python handleGHRelease: true +manifest: true # NOTE: this section is generated by synthtool.languages.python # See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py branches: diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 00000000..a68dab8f --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "2.10.4" +} diff --git a/docs/tasks_v2/types.rst b/docs/tasks_v2/types.rst index 7a2a9a4b..a43c04fd 100644 --- a/docs/tasks_v2/types.rst +++ b/docs/tasks_v2/types.rst @@ -3,5 +3,4 @@ Types for Google Cloud Tasks v2 API .. automodule:: google.cloud.tasks_v2.types :members: - :undoc-members: :show-inheritance: diff --git a/docs/tasks_v2beta2/types.rst b/docs/tasks_v2beta2/types.rst index 4a688d27..3a8eb123 100644 --- a/docs/tasks_v2beta2/types.rst +++ b/docs/tasks_v2beta2/types.rst @@ -3,5 +3,4 @@ Types for Google Cloud Tasks v2beta2 API .. automodule:: google.cloud.tasks_v2beta2.types :members: - :undoc-members: :show-inheritance: diff --git a/docs/tasks_v2beta3/types.rst b/docs/tasks_v2beta3/types.rst index 0f3455d1..37d181e6 100644 --- a/docs/tasks_v2beta3/types.rst +++ b/docs/tasks_v2beta3/types.rst @@ -3,5 +3,4 @@ Types for Google Cloud Tasks v2beta3 API .. automodule:: google.cloud.tasks_v2beta3.types :members: - :undoc-members: :show-inheritance: diff --git a/google/cloud/tasks/__init__.py b/google/cloud/tasks/__init__.py index e9b8ecc9..27456463 100644 --- a/google/cloud/tasks/__init__.py +++ b/google/cloud/tasks/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.tasks import gapic_version as package_version + +__version__ = package_version.__version__ + from google.cloud.tasks_v2.services.cloud_tasks.async_client import ( CloudTasksAsyncClient, diff --git a/google/cloud/tasks/gapic_version.py b/google/cloud/tasks/gapic_version.py new file mode 100644 index 00000000..fd2ac0e5 --- /dev/null +++ b/google/cloud/tasks/gapic_version.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +__version__ = "2.10.4" # {x-release-please-version} diff --git a/google/cloud/tasks_v2/__init__.py b/google/cloud/tasks_v2/__init__.py index f0f89bca..486a5a32 100644 --- a/google/cloud/tasks_v2/__init__.py +++ b/google/cloud/tasks_v2/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.tasks import gapic_version as package_version + +__version__ = package_version.__version__ + from .services.cloud_tasks import CloudTasksAsyncClient, CloudTasksClient from .types.cloudtasks import ( diff --git a/google/cloud/tasks_v2/services/cloud_tasks/async_client.py b/google/cloud/tasks_v2/services/cloud_tasks/async_client.py index 08a99462..0041a087 100644 --- a/google/cloud/tasks_v2/services/cloud_tasks/async_client.py +++ b/google/cloud/tasks_v2/services/cloud_tasks/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -168,9 +178,9 @@ def transport(self) -> CloudTasksTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, CloudTasksTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the cloud tasks client. @@ -214,11 +224,11 @@ def __init__( async def list_queues( self, - request: Union[cloudtasks.ListQueuesRequest, dict] = None, + request: Optional[Union[cloudtasks.ListQueuesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesAsyncPager: r"""Lists queues. @@ -252,7 +262,7 @@ async def sample_list_queues(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.ListQueuesRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.ListQueuesRequest, dict]]): The request object. Request message for [ListQueues][google.cloud.tasks.v2.CloudTasks.ListQueues]. parent (:class:`str`): @@ -340,11 +350,11 @@ async def sample_list_queues(): async def get_queue( self, - request: Union[cloudtasks.GetQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.GetQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -376,7 +386,7 @@ async def sample_get_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.GetQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.GetQueueRequest, dict]]): The request object. Request message for [GetQueue][google.cloud.tasks.v2.CloudTasks.GetQueue]. name (:class:`str`): @@ -456,12 +466,12 @@ async def sample_get_queue(): async def create_queue( self, - request: Union[cloudtasks.CreateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateQueueRequest, dict]] = None, *, - parent: str = None, - queue: gct_queue.Queue = None, + parent: Optional[str] = None, + queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -503,7 +513,7 @@ async def sample_create_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.CreateQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.CreateQueueRequest, dict]]): The request object. Request message for [CreateQueue][google.cloud.tasks.v2.CloudTasks.CreateQueue]. parent (:class:`str`): @@ -589,12 +599,12 @@ async def sample_create_queue(): async def update_queue( self, - request: Union[cloudtasks.UpdateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.UpdateQueueRequest, dict]] = None, *, - queue: gct_queue.Queue = None, - update_mask: field_mask_pb2.FieldMask = None, + queue: Optional[gct_queue.Queue] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -638,7 +648,7 @@ async def sample_update_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.UpdateQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.UpdateQueueRequest, dict]]): The request object. Request message for [UpdateQueue][google.cloud.tasks.v2.CloudTasks.UpdateQueue]. queue (:class:`google.cloud.tasks_v2.types.Queue`): @@ -729,11 +739,11 @@ async def sample_update_queue(): async def delete_queue( self, - request: Union[cloudtasks.DeleteQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -773,7 +783,7 @@ async def sample_delete_queue(): await client.delete_queue(request=request) Args: - request (Union[google.cloud.tasks_v2.types.DeleteQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.DeleteQueueRequest, dict]]): The request object. Request message for [DeleteQueue][google.cloud.tasks.v2.CloudTasks.DeleteQueue]. name (:class:`str`): @@ -840,11 +850,11 @@ async def sample_delete_queue(): async def purge_queue( self, - request: Union[cloudtasks.PurgeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PurgeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -881,7 +891,7 @@ async def sample_purge_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.PurgeQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.PurgeQueueRequest, dict]]): The request object. Request message for [PurgeQueue][google.cloud.tasks.v2.CloudTasks.PurgeQueue]. name (:class:`str`): @@ -951,11 +961,11 @@ async def sample_purge_queue(): async def pause_queue( self, - request: Union[cloudtasks.PauseQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PauseQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -994,7 +1004,7 @@ async def sample_pause_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.PauseQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.PauseQueueRequest, dict]]): The request object. Request message for [PauseQueue][google.cloud.tasks.v2.CloudTasks.PauseQueue]. name (:class:`str`): @@ -1064,11 +1074,11 @@ async def sample_pause_queue(): async def resume_queue( self, - request: Union[cloudtasks.ResumeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.ResumeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1114,7 +1124,7 @@ async def sample_resume_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.ResumeQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.ResumeQueueRequest, dict]]): The request object. Request message for [ResumeQueue][google.cloud.tasks.v2.CloudTasks.ResumeQueue]. name (:class:`str`): @@ -1184,11 +1194,11 @@ async def sample_resume_queue(): async def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1229,7 +1239,7 @@ async def sample_get_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]]): The request object. Request message for `GetIamPolicy` method. resource (:class:`str`): @@ -1368,11 +1378,11 @@ async def sample_get_iam_policy(): async def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1417,7 +1427,7 @@ async def sample_set_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]]): The request object. Request message for `SetIamPolicy` method. resource (:class:`str`): @@ -1546,12 +1556,12 @@ async def sample_set_iam_policy(): async def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, - resource: str = None, - permissions: Sequence[str] = None, + resource: Optional[str] = None, + permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1593,7 +1603,7 @@ async def sample_test_iam_permissions(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]]): The request object. Request message for `TestIamPermissions` method. resource (:class:`str`): @@ -1605,7 +1615,7 @@ async def sample_test_iam_permissions(): This corresponds to the ``resource`` field on the ``request`` instance; if ``request`` is provided, this should not be set. - permissions (:class:`Sequence[str]`): + permissions (:class:`MutableSequence[str]`): The set of permissions to check for the ``resource``. Permissions with wildcards (such as '*' or 'storage.*') are not allowed. For more information see `IAM @@ -1681,11 +1691,11 @@ async def sample_test_iam_permissions(): async def list_tasks( self, - request: Union[cloudtasks.ListTasksRequest, dict] = None, + request: Optional[Union[cloudtasks.ListTasksRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksAsyncPager: r"""Lists the tasks in a queue. @@ -1727,7 +1737,7 @@ async def sample_list_tasks(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.ListTasksRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.ListTasksRequest, dict]]): The request object. Request message for listing tasks using [ListTasks][google.cloud.tasks.v2.CloudTasks.ListTasks]. @@ -1816,11 +1826,11 @@ async def sample_list_tasks(): async def get_task( self, - request: Union[cloudtasks.GetTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.GetTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -1852,7 +1862,7 @@ async def sample_get_task(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.GetTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.GetTaskRequest, dict]]): The request object. Request message for getting a task using [GetTask][google.cloud.tasks.v2.CloudTasks.GetTask]. @@ -1927,12 +1937,12 @@ async def sample_get_task(): async def create_task( self, - request: Union[cloudtasks.CreateTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateTaskRequest, dict]] = None, *, - parent: str = None, - task: gct_task.Task = None, + parent: Optional[str] = None, + task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -1969,7 +1979,7 @@ async def sample_create_task(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.CreateTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.CreateTaskRequest, dict]]): The request object. Request message for [CreateTask][google.cloud.tasks.v2.CloudTasks.CreateTask]. parent (:class:`str`): @@ -2083,11 +2093,11 @@ async def sample_create_task(): async def delete_task( self, - request: Union[cloudtasks.DeleteTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2119,7 +2129,7 @@ async def sample_delete_task(): await client.delete_task(request=request) Args: - request (Union[google.cloud.tasks_v2.types.DeleteTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.DeleteTaskRequest, dict]]): The request object. Request message for deleting a task using [DeleteTask][google.cloud.tasks.v2.CloudTasks.DeleteTask]. @@ -2187,11 +2197,11 @@ async def sample_delete_task(): async def run_task( self, - request: Union[cloudtasks.RunTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.RunTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -2249,7 +2259,7 @@ async def sample_run_task(): print(response) Args: - request (Union[google.cloud.tasks_v2.types.RunTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2.types.RunTaskRequest, dict]]): The request object. Request message for forcing a task to run now using [RunTask][google.cloud.tasks.v2.CloudTasks.RunTask]. diff --git a/google/cloud/tasks_v2/services/cloud_tasks/client.py b/google/cloud/tasks_v2/services/cloud_tasks/client.py index 7166364d..23a5c88b 100644 --- a/google/cloud/tasks_v2/services/cloud_tasks/client.py +++ b/google/cloud/tasks_v2/services/cloud_tasks/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -67,7 +78,7 @@ class CloudTasksClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[CloudTasksTransport]: """Returns an appropriate transport class. @@ -368,8 +379,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, CloudTasksTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, CloudTasksTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the cloud tasks client. @@ -383,7 +394,7 @@ def __init__( transport (Union[str, CloudTasksTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -413,6 +424,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -465,11 +477,11 @@ def __init__( def list_queues( self, - request: Union[cloudtasks.ListQueuesRequest, dict] = None, + request: Optional[Union[cloudtasks.ListQueuesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesPager: r"""Lists queues. @@ -581,11 +593,11 @@ def sample_list_queues(): def get_queue( self, - request: Union[cloudtasks.GetQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.GetQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -687,12 +699,12 @@ def sample_get_queue(): def create_queue( self, - request: Union[cloudtasks.CreateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateQueueRequest, dict]] = None, *, - parent: str = None, - queue: gct_queue.Queue = None, + parent: Optional[str] = None, + queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -820,12 +832,12 @@ def sample_create_queue(): def update_queue( self, - request: Union[cloudtasks.UpdateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.UpdateQueueRequest, dict]] = None, *, - queue: gct_queue.Queue = None, - update_mask: field_mask_pb2.FieldMask = None, + queue: Optional[gct_queue.Queue] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -960,11 +972,11 @@ def sample_update_queue(): def delete_queue( self, - request: Union[cloudtasks.DeleteQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -1061,11 +1073,11 @@ def sample_delete_queue(): def purge_queue( self, - request: Union[cloudtasks.PurgeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PurgeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -1172,11 +1184,11 @@ def sample_purge_queue(): def pause_queue( self, - request: Union[cloudtasks.PauseQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PauseQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1285,11 +1297,11 @@ def sample_pause_queue(): def resume_queue( self, - request: Union[cloudtasks.ResumeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.ResumeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1405,11 +1417,11 @@ def sample_resume_queue(): def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1576,11 +1588,11 @@ def sample_get_iam_policy(): def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1751,12 +1763,12 @@ def sample_set_iam_policy(): def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, - resource: str = None, - permissions: Sequence[str] = None, + resource: Optional[str] = None, + permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1810,7 +1822,7 @@ def sample_test_iam_permissions(): This corresponds to the ``resource`` field on the ``request`` instance; if ``request`` is provided, this should not be set. - permissions (Sequence[str]): + permissions (MutableSequence[str]): The set of permissions to check for the ``resource``. Permissions with wildcards (such as '*' or 'storage.*') are not allowed. For more information see `IAM @@ -1874,11 +1886,11 @@ def sample_test_iam_permissions(): def list_tasks( self, - request: Union[cloudtasks.ListTasksRequest, dict] = None, + request: Optional[Union[cloudtasks.ListTasksRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksPager: r"""Lists the tasks in a queue. @@ -1999,11 +2011,11 @@ def sample_list_tasks(): def get_task( self, - request: Union[cloudtasks.GetTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.GetTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -2100,12 +2112,12 @@ def sample_get_task(): def create_task( self, - request: Union[cloudtasks.CreateTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateTaskRequest, dict]] = None, *, - parent: str = None, - task: gct_task.Task = None, + parent: Optional[str] = None, + task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2256,11 +2268,11 @@ def sample_create_task(): def delete_task( self, - request: Union[cloudtasks.DeleteTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2350,11 +2362,11 @@ def sample_delete_task(): def run_task( self, - request: Union[cloudtasks.RunTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.RunTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. diff --git a/google/cloud/tasks_v2/services/cloud_tasks/transports/base.py b/google/cloud/tasks_v2/services/cloud_tasks/transports/base.py index 5b9448b1..eea2138f 100644 --- a/google/cloud/tasks_v2/services/cloud_tasks/transports/base.py +++ b/google/cloud/tasks_v2/services/cloud_tasks/transports/base.py @@ -55,7 +55,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/google/cloud/tasks_v2/services/cloud_tasks/transports/grpc.py b/google/cloud/tasks_v2/services/cloud_tasks/transports/grpc.py index 107bb94b..bffb75b8 100644 --- a/google/cloud/tasks_v2/services/cloud_tasks/transports/grpc.py +++ b/google/cloud/tasks_v2/services/cloud_tasks/transports/grpc.py @@ -54,14 +54,14 @@ def __init__( self, *, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -188,8 +188,8 @@ def __init__( def create_channel( cls, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/google/cloud/tasks_v2/services/cloud_tasks/transports/grpc_asyncio.py b/google/cloud/tasks_v2/services/cloud_tasks/transports/grpc_asyncio.py index 9a5fa7b1..3be1f556 100644 --- a/google/cloud/tasks_v2/services/cloud_tasks/transports/grpc_asyncio.py +++ b/google/cloud/tasks_v2/services/cloud_tasks/transports/grpc_asyncio.py @@ -56,7 +56,7 @@ class CloudTasksGrpcAsyncIOTransport(CloudTasksTransport): def create_channel( cls, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -99,15 +99,15 @@ def __init__( self, *, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/google/cloud/tasks_v2/types/cloudtasks.py b/google/cloud/tasks_v2/types/cloudtasks.py index f4cf7e0a..1a080a53 100644 --- a/google/cloud/tasks_v2/types/cloudtasks.py +++ b/google/cloud/tasks_v2/types/cloudtasks.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore @@ -83,19 +85,19 @@ class ListQueuesRequest(proto.Message): while iterating through pages. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=2, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=3, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=4, ) @@ -106,7 +108,7 @@ class ListQueuesResponse(proto.Message): [ListQueues][google.cloud.tasks.v2.CloudTasks.ListQueues]. Attributes: - queues (Sequence[google.cloud.tasks_v2.types.Queue]): + queues (MutableSequence[google.cloud.tasks_v2.types.Queue]): The list of queues. next_page_token (str): A token to retrieve next page of results. @@ -125,12 +127,12 @@ class ListQueuesResponse(proto.Message): def raw_page(self): return self - queues = proto.RepeatedField( + queues: MutableSequence[gct_queue.Queue] = proto.RepeatedField( proto.MESSAGE, number=1, message=gct_queue.Queue, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -146,7 +148,7 @@ class GetQueueRequest(proto.Message): ``projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -172,11 +174,11 @@ class CreateQueueRequest(proto.Message): the same as an existing queue. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - queue = proto.Field( + queue: gct_queue.Queue = proto.Field( proto.MESSAGE, number=2, message=gct_queue.Queue, @@ -204,12 +206,12 @@ class UpdateQueueRequest(proto.Message): If empty, then all fields will be updated. """ - queue = proto.Field( + queue: gct_queue.Queue = proto.Field( proto.MESSAGE, number=1, message=gct_queue.Queue, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -226,7 +228,7 @@ class DeleteQueueRequest(proto.Message): ``projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -242,7 +244,7 @@ class PurgeQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -258,7 +260,7 @@ class PauseQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -274,7 +276,7 @@ class ResumeQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -328,20 +330,20 @@ class ListTasksRequest(proto.Message): The page token is valid for only 2 hours. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=3, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=4, ) @@ -352,7 +354,7 @@ class ListTasksResponse(proto.Message): [ListTasks][google.cloud.tasks.v2.CloudTasks.ListTasks]. Attributes: - tasks (Sequence[google.cloud.tasks_v2.types.Task]): + tasks (MutableSequence[google.cloud.tasks_v2.types.Task]): The list of tasks. next_page_token (str): A token to retrieve next page of results. @@ -369,12 +371,12 @@ class ListTasksResponse(proto.Message): def raw_page(self): return self - tasks = proto.RepeatedField( + tasks: MutableSequence[gct_task.Task] = proto.RepeatedField( proto.MESSAGE, number=1, message=gct_task.Task, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -406,11 +408,11 @@ class GetTaskRequest(proto.Message): [Task][google.cloud.tasks.v2.Task] resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, @@ -485,16 +487,16 @@ class CreateTaskRequest(proto.Message): [Task][google.cloud.tasks.v2.Task] resource. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - task = proto.Field( + task: gct_task.Task = proto.Field( proto.MESSAGE, number=2, message=gct_task.Task, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=3, enum=gct_task.Task.View, @@ -511,7 +513,7 @@ class DeleteTaskRequest(proto.Message): ``projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -543,11 +545,11 @@ class RunTaskRequest(proto.Message): [Task][google.cloud.tasks.v2.Task] resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, diff --git a/google/cloud/tasks_v2/types/queue.py b/google/cloud/tasks_v2/types/queue.py index 89a6d123..9d93a391 100644 --- a/google/cloud/tasks_v2/types/queue.py +++ b/google/cloud/tasks_v2/types/queue.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore @@ -153,36 +155,36 @@ class State(proto.Enum): PAUSED = 2 DISABLED = 3 - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - app_engine_routing_override = proto.Field( + app_engine_routing_override: target.AppEngineRouting = proto.Field( proto.MESSAGE, number=2, message=target.AppEngineRouting, ) - rate_limits = proto.Field( + rate_limits: "RateLimits" = proto.Field( proto.MESSAGE, number=3, message="RateLimits", ) - retry_config = proto.Field( + retry_config: "RetryConfig" = proto.Field( proto.MESSAGE, number=4, message="RetryConfig", ) - state = proto.Field( + state: State = proto.Field( proto.ENUM, number=5, enum=State, ) - purge_time = proto.Field( + purge_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=6, message=timestamp_pb2.Timestamp, ) - stackdriver_logging_config = proto.Field( + stackdriver_logging_config: "StackdriverLoggingConfig" = proto.Field( proto.MESSAGE, number=9, message="StackdriverLoggingConfig", @@ -265,15 +267,15 @@ class RateLimits(proto.Message): queue.yaml/xml `__. """ - max_dispatches_per_second = proto.Field( + max_dispatches_per_second: float = proto.Field( proto.DOUBLE, number=1, ) - max_burst_size = proto.Field( + max_burst_size: int = proto.Field( proto.INT32, number=2, ) - max_concurrent_dispatches = proto.Field( + max_concurrent_dispatches: int = proto.Field( proto.INT32, number=3, ) @@ -387,26 +389,26 @@ class RetryConfig(proto.Message): queue.yaml/xml `__. """ - max_attempts = proto.Field( + max_attempts: int = proto.Field( proto.INT32, number=1, ) - max_retry_duration = proto.Field( + max_retry_duration: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=2, message=duration_pb2.Duration, ) - min_backoff = proto.Field( + min_backoff: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=3, message=duration_pb2.Duration, ) - max_backoff = proto.Field( + max_backoff: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=4, message=duration_pb2.Duration, ) - max_doublings = proto.Field( + max_doublings: int = proto.Field( proto.INT32, number=5, ) @@ -425,7 +427,7 @@ class StackdriverLoggingConfig(proto.Message): 0.0 is the default and means that no operations are logged. """ - sampling_ratio = proto.Field( + sampling_ratio: float = proto.Field( proto.DOUBLE, number=1, ) diff --git a/google/cloud/tasks_v2/types/target.py b/google/cloud/tasks_v2/types/target.py index 129615dc..7fd7450c 100644 --- a/google/cloud/tasks_v2/types/target.py +++ b/google/cloud/tasks_v2/types/target.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + import proto # type: ignore __protobuf__ = proto.module( @@ -100,7 +102,7 @@ class HttpRequest(proto.Message): http_method (google.cloud.tasks_v2.types.HttpMethod): The HTTP method to use for the request. The default is POST. - headers (Mapping[str, str]): + headers (MutableMapping[str, str]): HTTP request headers. This map contains the header field names and values. Headers @@ -164,31 +166,31 @@ class HttpRequest(proto.Message): This field is a member of `oneof`_ ``authorization_header``. """ - url = proto.Field( + url: str = proto.Field( proto.STRING, number=1, ) - http_method = proto.Field( + http_method: "HttpMethod" = proto.Field( proto.ENUM, number=2, enum="HttpMethod", ) - headers = proto.MapField( + headers: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=3, ) - body = proto.Field( + body: bytes = proto.Field( proto.BYTES, number=4, ) - oauth_token = proto.Field( + oauth_token: "OAuthToken" = proto.Field( proto.MESSAGE, number=5, oneof="authorization_header", message="OAuthToken", ) - oidc_token = proto.Field( + oidc_token: "OidcToken" = proto.Field( proto.MESSAGE, number=6, oneof="authorization_header", @@ -288,7 +290,7 @@ class AppEngineHttpRequest(proto.Message): is empty, then the root path "/" will be used. No spaces are allowed, and the maximum length allowed is 2083 characters. - headers (Mapping[str, str]): + headers (MutableMapping[str, str]): HTTP request headers. This map contains the header field names and values. Headers @@ -347,26 +349,26 @@ class AppEngineHttpRequest(proto.Message): incompatible [HttpMethod][google.cloud.tasks.v2.HttpMethod]. """ - http_method = proto.Field( + http_method: "HttpMethod" = proto.Field( proto.ENUM, number=1, enum="HttpMethod", ) - app_engine_routing = proto.Field( + app_engine_routing: "AppEngineRouting" = proto.Field( proto.MESSAGE, number=2, message="AppEngineRouting", ) - relative_uri = proto.Field( + relative_uri: str = proto.Field( proto.STRING, number=3, ) - headers = proto.MapField( + headers: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=4, ) - body = proto.Field( + body: bytes = proto.Field( proto.BYTES, number=5, ) @@ -475,19 +477,19 @@ class AppEngineRouting(proto.Message): Routed `__. """ - service = proto.Field( + service: str = proto.Field( proto.STRING, number=1, ) - version = proto.Field( + version: str = proto.Field( proto.STRING, number=2, ) - instance = proto.Field( + instance: str = proto.Field( proto.STRING, number=3, ) - host = proto.Field( + host: str = proto.Field( proto.STRING, number=4, ) @@ -514,11 +516,11 @@ class OAuthToken(proto.Message): will be used. """ - service_account_email = proto.Field( + service_account_email: str = proto.Field( proto.STRING, number=1, ) - scope = proto.Field( + scope: str = proto.Field( proto.STRING, number=2, ) @@ -545,11 +547,11 @@ class OidcToken(proto.Message): target will be used. """ - service_account_email = proto.Field( + service_account_email: str = proto.Field( proto.STRING, number=1, ) - audience = proto.Field( + audience: str = proto.Field( proto.STRING, number=2, ) diff --git a/google/cloud/tasks_v2/types/task.py b/google/cloud/tasks_v2/types/task.py index 09dabb7c..1ebf3179 100644 --- a/google/cloud/tasks_v2/types/task.py +++ b/google/cloud/tasks_v2/types/task.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore @@ -166,56 +168,56 @@ class View(proto.Enum): BASIC = 1 FULL = 2 - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - app_engine_http_request = proto.Field( + app_engine_http_request: target.AppEngineHttpRequest = proto.Field( proto.MESSAGE, number=2, oneof="message_type", message=target.AppEngineHttpRequest, ) - http_request = proto.Field( + http_request: target.HttpRequest = proto.Field( proto.MESSAGE, number=3, oneof="message_type", message=target.HttpRequest, ) - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp, ) - create_time = proto.Field( + create_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=5, message=timestamp_pb2.Timestamp, ) - dispatch_deadline = proto.Field( + dispatch_deadline: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=6, message=duration_pb2.Duration, ) - dispatch_count = proto.Field( + dispatch_count: int = proto.Field( proto.INT32, number=7, ) - response_count = proto.Field( + response_count: int = proto.Field( proto.INT32, number=8, ) - first_attempt = proto.Field( + first_attempt: "Attempt" = proto.Field( proto.MESSAGE, number=9, message="Attempt", ) - last_attempt = proto.Field( + last_attempt: "Attempt" = proto.Field( proto.MESSAGE, number=10, message="Attempt", ) - view = proto.Field( + view: View = proto.Field( proto.ENUM, number=11, enum=View, @@ -250,22 +252,22 @@ class Attempt(proto.Message): ``response_status`` field is meaningless. """ - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=1, message=timestamp_pb2.Timestamp, ) - dispatch_time = proto.Field( + dispatch_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, ) - response_time = proto.Field( + response_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp, ) - response_status = proto.Field( + response_status: status_pb2.Status = proto.Field( proto.MESSAGE, number=4, message=status_pb2.Status, diff --git a/google/cloud/tasks_v2beta2/__init__.py b/google/cloud/tasks_v2beta2/__init__.py index 6ad082cb..f379faea 100644 --- a/google/cloud/tasks_v2beta2/__init__.py +++ b/google/cloud/tasks_v2beta2/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.tasks import gapic_version as package_version + +__version__ = package_version.__version__ + from .services.cloud_tasks import CloudTasksAsyncClient, CloudTasksClient from .types.cloudtasks import ( diff --git a/google/cloud/tasks_v2beta2/services/cloud_tasks/async_client.py b/google/cloud/tasks_v2beta2/services/cloud_tasks/async_client.py index 3cf05b19..f7ee442c 100644 --- a/google/cloud/tasks_v2beta2/services/cloud_tasks/async_client.py +++ b/google/cloud/tasks_v2beta2/services/cloud_tasks/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -168,9 +178,9 @@ def transport(self) -> CloudTasksTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, CloudTasksTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the cloud tasks client. @@ -214,11 +224,11 @@ def __init__( async def list_queues( self, - request: Union[cloudtasks.ListQueuesRequest, dict] = None, + request: Optional[Union[cloudtasks.ListQueuesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesAsyncPager: r"""Lists queues. @@ -252,7 +262,7 @@ async def sample_list_queues(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.ListQueuesRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.ListQueuesRequest, dict]]): The request object. Request message for [ListQueues][google.cloud.tasks.v2beta2.CloudTasks.ListQueues]. parent (:class:`str`): @@ -340,11 +350,11 @@ async def sample_list_queues(): async def get_queue( self, - request: Union[cloudtasks.GetQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.GetQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -376,7 +386,7 @@ async def sample_get_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.GetQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.GetQueueRequest, dict]]): The request object. Request message for [GetQueue][google.cloud.tasks.v2beta2.CloudTasks.GetQueue]. name (:class:`str`): @@ -456,12 +466,12 @@ async def sample_get_queue(): async def create_queue( self, - request: Union[cloudtasks.CreateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateQueueRequest, dict]] = None, *, - parent: str = None, - queue: gct_queue.Queue = None, + parent: Optional[str] = None, + queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -503,7 +513,7 @@ async def sample_create_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.CreateQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.CreateQueueRequest, dict]]): The request object. Request message for [CreateQueue][google.cloud.tasks.v2beta2.CloudTasks.CreateQueue]. parent (:class:`str`): @@ -589,12 +599,12 @@ async def sample_create_queue(): async def update_queue( self, - request: Union[cloudtasks.UpdateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.UpdateQueueRequest, dict]] = None, *, - queue: gct_queue.Queue = None, - update_mask: field_mask_pb2.FieldMask = None, + queue: Optional[gct_queue.Queue] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -638,7 +648,7 @@ async def sample_update_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.UpdateQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.UpdateQueueRequest, dict]]): The request object. Request message for [UpdateQueue][google.cloud.tasks.v2beta2.CloudTasks.UpdateQueue]. queue (:class:`google.cloud.tasks_v2beta2.types.Queue`): @@ -730,11 +740,11 @@ async def sample_update_queue(): async def delete_queue( self, - request: Union[cloudtasks.DeleteQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -774,7 +784,7 @@ async def sample_delete_queue(): await client.delete_queue(request=request) Args: - request (Union[google.cloud.tasks_v2beta2.types.DeleteQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.DeleteQueueRequest, dict]]): The request object. Request message for [DeleteQueue][google.cloud.tasks.v2beta2.CloudTasks.DeleteQueue]. name (:class:`str`): @@ -841,11 +851,11 @@ async def sample_delete_queue(): async def purge_queue( self, - request: Union[cloudtasks.PurgeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PurgeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -882,7 +892,7 @@ async def sample_purge_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.PurgeQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.PurgeQueueRequest, dict]]): The request object. Request message for [PurgeQueue][google.cloud.tasks.v2beta2.CloudTasks.PurgeQueue]. name (:class:`str`): @@ -952,11 +962,11 @@ async def sample_purge_queue(): async def pause_queue( self, - request: Union[cloudtasks.PauseQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PauseQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -995,7 +1005,7 @@ async def sample_pause_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.PauseQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.PauseQueueRequest, dict]]): The request object. Request message for [PauseQueue][google.cloud.tasks.v2beta2.CloudTasks.PauseQueue]. name (:class:`str`): @@ -1065,11 +1075,11 @@ async def sample_pause_queue(): async def resume_queue( self, - request: Union[cloudtasks.ResumeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.ResumeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1115,7 +1125,7 @@ async def sample_resume_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.ResumeQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.ResumeQueueRequest, dict]]): The request object. Request message for [ResumeQueue][google.cloud.tasks.v2beta2.CloudTasks.ResumeQueue]. name (:class:`str`): @@ -1185,11 +1195,11 @@ async def sample_resume_queue(): async def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1230,7 +1240,7 @@ async def sample_get_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]]): The request object. Request message for `GetIamPolicy` method. resource (:class:`str`): @@ -1369,11 +1379,11 @@ async def sample_get_iam_policy(): async def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1418,7 +1428,7 @@ async def sample_set_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]]): The request object. Request message for `SetIamPolicy` method. resource (:class:`str`): @@ -1547,12 +1557,12 @@ async def sample_set_iam_policy(): async def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, - resource: str = None, - permissions: Sequence[str] = None, + resource: Optional[str] = None, + permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1594,7 +1604,7 @@ async def sample_test_iam_permissions(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]]): The request object. Request message for `TestIamPermissions` method. resource (:class:`str`): @@ -1606,7 +1616,7 @@ async def sample_test_iam_permissions(): This corresponds to the ``resource`` field on the ``request`` instance; if ``request`` is provided, this should not be set. - permissions (:class:`Sequence[str]`): + permissions (:class:`MutableSequence[str]`): The set of permissions to check for the ``resource``. Permissions with wildcards (such as '*' or 'storage.*') are not allowed. For more information see `IAM @@ -1682,11 +1692,11 @@ async def sample_test_iam_permissions(): async def list_tasks( self, - request: Union[cloudtasks.ListTasksRequest, dict] = None, + request: Optional[Union[cloudtasks.ListTasksRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksAsyncPager: r"""Lists the tasks in a queue. @@ -1728,7 +1738,7 @@ async def sample_list_tasks(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.ListTasksRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.ListTasksRequest, dict]]): The request object. Request message for listing tasks using [ListTasks][google.cloud.tasks.v2beta2.CloudTasks.ListTasks]. @@ -1817,11 +1827,11 @@ async def sample_list_tasks(): async def get_task( self, - request: Union[cloudtasks.GetTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.GetTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -1853,7 +1863,7 @@ async def sample_get_task(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.GetTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.GetTaskRequest, dict]]): The request object. Request message for getting a task using [GetTask][google.cloud.tasks.v2beta2.CloudTasks.GetTask]. @@ -1928,12 +1938,12 @@ async def sample_get_task(): async def create_task( self, - request: Union[cloudtasks.CreateTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateTaskRequest, dict]] = None, *, - parent: str = None, - task: gct_task.Task = None, + parent: Optional[str] = None, + task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -1974,7 +1984,7 @@ async def sample_create_task(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.CreateTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.CreateTaskRequest, dict]]): The request object. Request message for [CreateTask][google.cloud.tasks.v2beta2.CloudTasks.CreateTask]. parent (:class:`str`): @@ -2088,11 +2098,11 @@ async def sample_create_task(): async def delete_task( self, - request: Union[cloudtasks.DeleteTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2124,7 +2134,7 @@ async def sample_delete_task(): await client.delete_task(request=request) Args: - request (Union[google.cloud.tasks_v2beta2.types.DeleteTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.DeleteTaskRequest, dict]]): The request object. Request message for deleting a task using [DeleteTask][google.cloud.tasks.v2beta2.CloudTasks.DeleteTask]. @@ -2192,12 +2202,12 @@ async def sample_delete_task(): async def lease_tasks( self, - request: Union[cloudtasks.LeaseTasksRequest, dict] = None, + request: Optional[Union[cloudtasks.LeaseTasksRequest, dict]] = None, *, - parent: str = None, - lease_duration: duration_pb2.Duration = None, + parent: Optional[str] = None, + lease_duration: Optional[duration_pb2.Duration] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> cloudtasks.LeaseTasksResponse: r"""Leases tasks from a pull queue for @@ -2252,7 +2262,7 @@ async def sample_lease_tasks(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.LeaseTasksRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.LeaseTasksRequest, dict]]): The request object. Request message for leasing tasks using [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks]. @@ -2351,12 +2361,12 @@ async def sample_lease_tasks(): async def acknowledge_task( self, - request: Union[cloudtasks.AcknowledgeTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.AcknowledgeTaskRequest, dict]] = None, *, - name: str = None, - schedule_time: timestamp_pb2.Timestamp = None, + name: Optional[str] = None, + schedule_time: Optional[timestamp_pb2.Timestamp] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Acknowledges a pull task. @@ -2399,7 +2409,7 @@ async def sample_acknowledge_task(): await client.acknowledge_task(request=request) Args: - request (Union[google.cloud.tasks_v2beta2.types.AcknowledgeTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.AcknowledgeTaskRequest, dict]]): The request object. Request message for acknowledging a task using [AcknowledgeTask][google.cloud.tasks.v2beta2.CloudTasks.AcknowledgeTask]. @@ -2473,13 +2483,13 @@ async def sample_acknowledge_task(): async def renew_lease( self, - request: Union[cloudtasks.RenewLeaseRequest, dict] = None, + request: Optional[Union[cloudtasks.RenewLeaseRequest, dict]] = None, *, - name: str = None, - schedule_time: timestamp_pb2.Timestamp = None, - lease_duration: duration_pb2.Duration = None, + name: Optional[str] = None, + schedule_time: Optional[timestamp_pb2.Timestamp] = None, + lease_duration: Optional[duration_pb2.Duration] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Renew the current lease of a pull task. @@ -2516,7 +2526,7 @@ async def sample_renew_lease(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.RenewLeaseRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.RenewLeaseRequest, dict]]): The request object. Request message for renewing a lease using [RenewLease][google.cloud.tasks.v2beta2.CloudTasks.RenewLease]. @@ -2609,12 +2619,12 @@ async def sample_renew_lease(): async def cancel_lease( self, - request: Union[cloudtasks.CancelLeaseRequest, dict] = None, + request: Optional[Union[cloudtasks.CancelLeaseRequest, dict]] = None, *, - name: str = None, - schedule_time: timestamp_pb2.Timestamp = None, + name: Optional[str] = None, + schedule_time: Optional[timestamp_pb2.Timestamp] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Cancel a pull task's lease. @@ -2653,7 +2663,7 @@ async def sample_cancel_lease(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.CancelLeaseRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.CancelLeaseRequest, dict]]): The request object. Request message for canceling a lease using [CancelLease][google.cloud.tasks.v2beta2.CloudTasks.CancelLease]. @@ -2734,11 +2744,11 @@ async def sample_cancel_lease(): async def run_task( self, - request: Union[cloudtasks.RunTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.RunTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -2802,7 +2812,7 @@ async def sample_run_task(): print(response) Args: - request (Union[google.cloud.tasks_v2beta2.types.RunTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta2.types.RunTaskRequest, dict]]): The request object. Request message for forcing a task to run now using [RunTask][google.cloud.tasks.v2beta2.CloudTasks.RunTask]. diff --git a/google/cloud/tasks_v2beta2/services/cloud_tasks/client.py b/google/cloud/tasks_v2beta2/services/cloud_tasks/client.py index 08e03455..889e84ac 100644 --- a/google/cloud/tasks_v2beta2/services/cloud_tasks/client.py +++ b/google/cloud/tasks_v2beta2/services/cloud_tasks/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -67,7 +78,7 @@ class CloudTasksClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[CloudTasksTransport]: """Returns an appropriate transport class. @@ -368,8 +379,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, CloudTasksTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, CloudTasksTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the cloud tasks client. @@ -383,7 +394,7 @@ def __init__( transport (Union[str, CloudTasksTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -413,6 +424,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -465,11 +477,11 @@ def __init__( def list_queues( self, - request: Union[cloudtasks.ListQueuesRequest, dict] = None, + request: Optional[Union[cloudtasks.ListQueuesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesPager: r"""Lists queues. @@ -581,11 +593,11 @@ def sample_list_queues(): def get_queue( self, - request: Union[cloudtasks.GetQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.GetQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -687,12 +699,12 @@ def sample_get_queue(): def create_queue( self, - request: Union[cloudtasks.CreateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateQueueRequest, dict]] = None, *, - parent: str = None, - queue: gct_queue.Queue = None, + parent: Optional[str] = None, + queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -820,12 +832,12 @@ def sample_create_queue(): def update_queue( self, - request: Union[cloudtasks.UpdateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.UpdateQueueRequest, dict]] = None, *, - queue: gct_queue.Queue = None, - update_mask: field_mask_pb2.FieldMask = None, + queue: Optional[gct_queue.Queue] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -961,11 +973,11 @@ def sample_update_queue(): def delete_queue( self, - request: Union[cloudtasks.DeleteQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -1062,11 +1074,11 @@ def sample_delete_queue(): def purge_queue( self, - request: Union[cloudtasks.PurgeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PurgeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -1173,11 +1185,11 @@ def sample_purge_queue(): def pause_queue( self, - request: Union[cloudtasks.PauseQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PauseQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1286,11 +1298,11 @@ def sample_pause_queue(): def resume_queue( self, - request: Union[cloudtasks.ResumeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.ResumeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1406,11 +1418,11 @@ def sample_resume_queue(): def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1577,11 +1589,11 @@ def sample_get_iam_policy(): def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1752,12 +1764,12 @@ def sample_set_iam_policy(): def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, - resource: str = None, - permissions: Sequence[str] = None, + resource: Optional[str] = None, + permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1811,7 +1823,7 @@ def sample_test_iam_permissions(): This corresponds to the ``resource`` field on the ``request`` instance; if ``request`` is provided, this should not be set. - permissions (Sequence[str]): + permissions (MutableSequence[str]): The set of permissions to check for the ``resource``. Permissions with wildcards (such as '*' or 'storage.*') are not allowed. For more information see `IAM @@ -1875,11 +1887,11 @@ def sample_test_iam_permissions(): def list_tasks( self, - request: Union[cloudtasks.ListTasksRequest, dict] = None, + request: Optional[Union[cloudtasks.ListTasksRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksPager: r"""Lists the tasks in a queue. @@ -2000,11 +2012,11 @@ def sample_list_tasks(): def get_task( self, - request: Union[cloudtasks.GetTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.GetTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -2101,12 +2113,12 @@ def sample_get_task(): def create_task( self, - request: Union[cloudtasks.CreateTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateTaskRequest, dict]] = None, *, - parent: str = None, - task: gct_task.Task = None, + parent: Optional[str] = None, + task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2261,11 +2273,11 @@ def sample_create_task(): def delete_task( self, - request: Union[cloudtasks.DeleteTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2355,12 +2367,12 @@ def sample_delete_task(): def lease_tasks( self, - request: Union[cloudtasks.LeaseTasksRequest, dict] = None, + request: Optional[Union[cloudtasks.LeaseTasksRequest, dict]] = None, *, - parent: str = None, - lease_duration: duration_pb2.Duration = None, + parent: Optional[str] = None, + lease_duration: Optional[duration_pb2.Duration] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> cloudtasks.LeaseTasksResponse: r"""Leases tasks from a pull queue for @@ -2514,12 +2526,12 @@ def sample_lease_tasks(): def acknowledge_task( self, - request: Union[cloudtasks.AcknowledgeTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.AcknowledgeTaskRequest, dict]] = None, *, - name: str = None, - schedule_time: timestamp_pb2.Timestamp = None, + name: Optional[str] = None, + schedule_time: Optional[timestamp_pb2.Timestamp] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Acknowledges a pull task. @@ -2636,13 +2648,13 @@ def sample_acknowledge_task(): def renew_lease( self, - request: Union[cloudtasks.RenewLeaseRequest, dict] = None, + request: Optional[Union[cloudtasks.RenewLeaseRequest, dict]] = None, *, - name: str = None, - schedule_time: timestamp_pb2.Timestamp = None, - lease_duration: duration_pb2.Duration = None, + name: Optional[str] = None, + schedule_time: Optional[timestamp_pb2.Timestamp] = None, + lease_duration: Optional[duration_pb2.Duration] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Renew the current lease of a pull task. @@ -2772,12 +2784,12 @@ def sample_renew_lease(): def cancel_lease( self, - request: Union[cloudtasks.CancelLeaseRequest, dict] = None, + request: Optional[Union[cloudtasks.CancelLeaseRequest, dict]] = None, *, - name: str = None, - schedule_time: timestamp_pb2.Timestamp = None, + name: Optional[str] = None, + schedule_time: Optional[timestamp_pb2.Timestamp] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Cancel a pull task's lease. @@ -2897,11 +2909,11 @@ def sample_cancel_lease(): def run_task( self, - request: Union[cloudtasks.RunTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.RunTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. diff --git a/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/base.py b/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/base.py index 701728e1..09253b15 100644 --- a/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/base.py +++ b/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/base.py @@ -55,7 +55,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/grpc.py b/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/grpc.py index b37cf5bc..3d8a607e 100644 --- a/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/grpc.py +++ b/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/grpc.py @@ -54,14 +54,14 @@ def __init__( self, *, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -188,8 +188,8 @@ def __init__( def create_channel( cls, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/grpc_asyncio.py b/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/grpc_asyncio.py index 0eea1adf..0b3f71a1 100644 --- a/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/grpc_asyncio.py +++ b/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/grpc_asyncio.py @@ -56,7 +56,7 @@ class CloudTasksGrpcAsyncIOTransport(CloudTasksTransport): def create_channel( cls, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -99,15 +99,15 @@ def __init__( self, *, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/google/cloud/tasks_v2beta2/types/cloudtasks.py b/google/cloud/tasks_v2beta2/types/cloudtasks.py index c10244f7..e6a73ad7 100644 --- a/google/cloud/tasks_v2beta2/types/cloudtasks.py +++ b/google/cloud/tasks_v2beta2/types/cloudtasks.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import duration_pb2 # type: ignore from google.protobuf import field_mask_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore @@ -95,23 +97,23 @@ class ListQueuesRequest(proto.Message): returned only if it was explicitly specified in the mask. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=2, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=3, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=4, ) - read_mask = proto.Field( + read_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=5, message=field_mask_pb2.FieldMask, @@ -123,7 +125,7 @@ class ListQueuesResponse(proto.Message): [ListQueues][google.cloud.tasks.v2beta2.CloudTasks.ListQueues]. Attributes: - queues (Sequence[google.cloud.tasks_v2beta2.types.Queue]): + queues (MutableSequence[google.cloud.tasks_v2beta2.types.Queue]): The list of queues. next_page_token (str): A token to retrieve next page of results. @@ -142,12 +144,12 @@ class ListQueuesResponse(proto.Message): def raw_page(self): return self - queues = proto.RepeatedField( + queues: MutableSequence[gct_queue.Queue] = proto.RepeatedField( proto.MESSAGE, number=1, message=gct_queue.Queue, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -168,11 +170,11 @@ class GetQueueRequest(proto.Message): returned only if it was explicitly specified in the mask. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - read_mask = proto.Field( + read_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -199,11 +201,11 @@ class CreateQueueRequest(proto.Message): be the same as an existing queue. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - queue = proto.Field( + queue: gct_queue.Queue = proto.Field( proto.MESSAGE, number=2, message=gct_queue.Queue, @@ -231,12 +233,12 @@ class UpdateQueueRequest(proto.Message): If empty, then all fields will be updated. """ - queue = proto.Field( + queue: gct_queue.Queue = proto.Field( proto.MESSAGE, number=1, message=gct_queue.Queue, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -253,7 +255,7 @@ class DeleteQueueRequest(proto.Message): ``projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -269,7 +271,7 @@ class PurgeQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -285,7 +287,7 @@ class PauseQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -301,7 +303,7 @@ class ResumeQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -355,20 +357,20 @@ class ListTasksRequest(proto.Message): The page token is valid for only 2 hours. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=4, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=5, ) @@ -379,7 +381,7 @@ class ListTasksResponse(proto.Message): [ListTasks][google.cloud.tasks.v2beta2.CloudTasks.ListTasks]. Attributes: - tasks (Sequence[google.cloud.tasks_v2beta2.types.Task]): + tasks (MutableSequence[google.cloud.tasks_v2beta2.types.Task]): The list of tasks. next_page_token (str): A token to retrieve next page of results. @@ -396,12 +398,12 @@ class ListTasksResponse(proto.Message): def raw_page(self): return self - tasks = proto.RepeatedField( + tasks: MutableSequence[gct_task.Task] = proto.RepeatedField( proto.MESSAGE, number=1, message=gct_task.Task, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -433,11 +435,11 @@ class GetTaskRequest(proto.Message): [Task][google.cloud.tasks.v2beta2.Task] resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, @@ -513,16 +515,16 @@ class CreateTaskRequest(proto.Message): [Task][google.cloud.tasks.v2beta2.Task] resource. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - task = proto.Field( + task: gct_task.Task = proto.Field( proto.MESSAGE, number=2, message=gct_task.Task, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=3, enum=gct_task.Task.View, @@ -539,7 +541,7 @@ class DeleteTaskRequest(proto.Message): ``projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -646,25 +648,25 @@ class LeaseTasksRequest(proto.Message): displayed as empty in Cloud Tasks. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - max_tasks = proto.Field( + max_tasks: int = proto.Field( proto.INT32, number=2, ) - lease_duration = proto.Field( + lease_duration: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=3, message=duration_pb2.Duration, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=4, enum=gct_task.Task.View, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=5, ) @@ -675,11 +677,11 @@ class LeaseTasksResponse(proto.Message): [LeaseTasks][google.cloud.tasks.v2beta2.CloudTasks.LeaseTasks]. Attributes: - tasks (Sequence[google.cloud.tasks_v2beta2.types.Task]): + tasks (MutableSequence[google.cloud.tasks_v2beta2.types.Task]): The leased tasks. """ - tasks = proto.RepeatedField( + tasks: MutableSequence[gct_task.Task] = proto.RepeatedField( proto.MESSAGE, number=1, message=gct_task.Task, @@ -705,11 +707,11 @@ class AcknowledgeTaskRequest(proto.Message): currently holds the lease. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, @@ -756,21 +758,21 @@ class RenewLeaseRequest(proto.Message): [Task][google.cloud.tasks.v2beta2.Task] resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, ) - lease_duration = proto.Field( + lease_duration: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=3, message=duration_pb2.Duration, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=4, enum=gct_task.Task.View, @@ -812,16 +814,16 @@ class CancelLeaseRequest(proto.Message): [Task][google.cloud.tasks.v2beta2.Task] resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=3, enum=gct_task.Task.View, @@ -854,11 +856,11 @@ class RunTaskRequest(proto.Message): [Task][google.cloud.tasks.v2beta2.Task] resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, diff --git a/google/cloud/tasks_v2beta2/types/queue.py b/google/cloud/tasks_v2beta2/types/queue.py index 717f9ac3..84543844 100644 --- a/google/cloud/tasks_v2beta2/types/queue.py +++ b/google/cloud/tasks_v2beta2/types/queue.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore @@ -179,53 +181,53 @@ class State(proto.Enum): PAUSED = 2 DISABLED = 3 - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - app_engine_http_target = proto.Field( + app_engine_http_target: target.AppEngineHttpTarget = proto.Field( proto.MESSAGE, number=3, oneof="target_type", message=target.AppEngineHttpTarget, ) - pull_target = proto.Field( + pull_target: target.PullTarget = proto.Field( proto.MESSAGE, number=4, oneof="target_type", message=target.PullTarget, ) - rate_limits = proto.Field( + rate_limits: "RateLimits" = proto.Field( proto.MESSAGE, number=5, message="RateLimits", ) - retry_config = proto.Field( + retry_config: "RetryConfig" = proto.Field( proto.MESSAGE, number=6, message="RetryConfig", ) - state = proto.Field( + state: State = proto.Field( proto.ENUM, number=7, enum=State, ) - purge_time = proto.Field( + purge_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=8, message=timestamp_pb2.Timestamp, ) - task_ttl = proto.Field( + task_ttl: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=9, message=duration_pb2.Duration, ) - tombstone_ttl = proto.Field( + tombstone_ttl: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=10, message=duration_pb2.Duration, ) - stats = proto.Field( + stats: "QueueStats" = proto.Field( proto.MESSAGE, number=16, message="QueueStats", @@ -323,15 +325,15 @@ class RateLimits(proto.Message): queue.yaml/xml `__. """ - max_tasks_dispatched_per_second = proto.Field( + max_tasks_dispatched_per_second: float = proto.Field( proto.DOUBLE, number=1, ) - max_burst_size = proto.Field( + max_burst_size: int = proto.Field( proto.INT32, number=2, ) - max_concurrent_tasks = proto.Field( + max_concurrent_tasks: int = proto.Field( proto.INT32, number=3, ) @@ -463,32 +465,32 @@ class RetryConfig(proto.Message): queue.yaml/xml `__. """ - max_attempts = proto.Field( + max_attempts: int = proto.Field( proto.INT32, number=1, oneof="num_attempts", ) - unlimited_attempts = proto.Field( + unlimited_attempts: bool = proto.Field( proto.BOOL, number=2, oneof="num_attempts", ) - max_retry_duration = proto.Field( + max_retry_duration: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=3, message=duration_pb2.Duration, ) - min_backoff = proto.Field( + min_backoff: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=4, message=duration_pb2.Duration, ) - max_backoff = proto.Field( + max_backoff: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=5, message=duration_pb2.Duration, ) - max_doublings = proto.Field( + max_doublings: int = proto.Field( proto.INT32, number=6, ) @@ -527,24 +529,24 @@ class QueueStats(proto.Message): tasks in the queue are targeting. """ - tasks_count = proto.Field( + tasks_count: int = proto.Field( proto.INT64, number=1, ) - oldest_estimated_arrival_time = proto.Field( + oldest_estimated_arrival_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, ) - executed_last_minute_count = proto.Field( + executed_last_minute_count: int = proto.Field( proto.INT64, number=3, ) - concurrent_dispatches_count = proto.Field( + concurrent_dispatches_count: int = proto.Field( proto.INT64, number=4, ) - effective_execution_rate = proto.Field( + effective_execution_rate: float = proto.Field( proto.DOUBLE, number=5, ) diff --git a/google/cloud/tasks_v2beta2/types/target.py b/google/cloud/tasks_v2beta2/types/target.py index 95b5991b..720bd367 100644 --- a/google/cloud/tasks_v2beta2/types/target.py +++ b/google/cloud/tasks_v2beta2/types/target.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + import proto # type: ignore __protobuf__ = proto.module( @@ -79,11 +81,11 @@ class PullMessage(proto.Message): returned by Cloud Tasks. """ - payload = proto.Field( + payload: bytes = proto.Field( proto.BYTES, number=1, ) - tag = proto.Field( + tag: str = proto.Field( proto.STRING, number=2, ) @@ -120,7 +122,7 @@ class AppEngineHttpTarget(proto.Message): app_engine_routing][google.cloud.tasks.v2beta2.AppEngineHttpRequest.app_engine_routing]. """ - app_engine_routing_override = proto.Field( + app_engine_routing_override: "AppEngineRouting" = proto.Field( proto.MESSAGE, number=1, message="AppEngineRouting", @@ -223,7 +225,7 @@ class AppEngineHttpRequest(proto.Message): is empty, then the root path "/" will be used. No spaces are allowed, and the maximum length allowed is 2083 characters. - headers (Mapping[str, str]): + headers (MutableMapping[str, str]): HTTP request headers. This map contains the header field names and values. Headers @@ -284,26 +286,26 @@ class AppEngineHttpRequest(proto.Message): [HttpMethod][google.cloud.tasks.v2beta2.HttpMethod]. """ - http_method = proto.Field( + http_method: "HttpMethod" = proto.Field( proto.ENUM, number=1, enum="HttpMethod", ) - app_engine_routing = proto.Field( + app_engine_routing: "AppEngineRouting" = proto.Field( proto.MESSAGE, number=2, message="AppEngineRouting", ) - relative_url = proto.Field( + relative_url: str = proto.Field( proto.STRING, number=3, ) - headers = proto.MapField( + headers: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=4, ) - payload = proto.Field( + payload: bytes = proto.Field( proto.BYTES, number=5, ) @@ -465,19 +467,19 @@ class AppEngineRouting(proto.Message): version of the default service when the task is attempted. """ - service = proto.Field( + service: str = proto.Field( proto.STRING, number=1, ) - version = proto.Field( + version: str = proto.Field( proto.STRING, number=2, ) - instance = proto.Field( + instance: str = proto.Field( proto.STRING, number=3, ) - host = proto.Field( + host: str = proto.Field( proto.STRING, number=4, ) diff --git a/google/cloud/tasks_v2beta2/types/task.py b/google/cloud/tasks_v2beta2/types/task.py index af1b2df5..c1947db7 100644 --- a/google/cloud/tasks_v2beta2/types/task.py +++ b/google/cloud/tasks_v2beta2/types/task.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore import proto # type: ignore @@ -124,38 +126,38 @@ class View(proto.Enum): BASIC = 1 FULL = 2 - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - app_engine_http_request = proto.Field( + app_engine_http_request: target.AppEngineHttpRequest = proto.Field( proto.MESSAGE, number=3, oneof="payload_type", message=target.AppEngineHttpRequest, ) - pull_message = proto.Field( + pull_message: target.PullMessage = proto.Field( proto.MESSAGE, number=4, oneof="payload_type", message=target.PullMessage, ) - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=5, message=timestamp_pb2.Timestamp, ) - create_time = proto.Field( + create_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=6, message=timestamp_pb2.Timestamp, ) - status = proto.Field( + status: "TaskStatus" = proto.Field( proto.MESSAGE, number=7, message="TaskStatus", ) - view = proto.Field( + view: View = proto.Field( proto.ENUM, number=8, enum=View, @@ -195,20 +197,20 @@ class TaskStatus(proto.Message): tasks][google.cloud.tasks.v2beta2.PullMessage]. """ - attempt_dispatch_count = proto.Field( + attempt_dispatch_count: int = proto.Field( proto.INT32, number=1, ) - attempt_response_count = proto.Field( + attempt_response_count: int = proto.Field( proto.INT32, number=2, ) - first_attempt_status = proto.Field( + first_attempt_status: "AttemptStatus" = proto.Field( proto.MESSAGE, number=3, message="AttemptStatus", ) - last_attempt_status = proto.Field( + last_attempt_status: "AttemptStatus" = proto.Field( proto.MESSAGE, number=4, message="AttemptStatus", @@ -243,22 +245,22 @@ class AttemptStatus(proto.Message): unset. """ - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=1, message=timestamp_pb2.Timestamp, ) - dispatch_time = proto.Field( + dispatch_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, ) - response_time = proto.Field( + response_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp, ) - response_status = proto.Field( + response_status: status_pb2.Status = proto.Field( proto.MESSAGE, number=4, message=status_pb2.Status, diff --git a/google/cloud/tasks_v2beta3/__init__.py b/google/cloud/tasks_v2beta3/__init__.py index 87f47f7c..f7ffce01 100644 --- a/google/cloud/tasks_v2beta3/__init__.py +++ b/google/cloud/tasks_v2beta3/__init__.py @@ -13,6 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from google.cloud.tasks import gapic_version as package_version + +__version__ = package_version.__version__ + from .services.cloud_tasks import CloudTasksAsyncClient, CloudTasksClient from .types.cloudtasks import ( diff --git a/google/cloud/tasks_v2beta3/services/cloud_tasks/async_client.py b/google/cloud/tasks_v2beta3/services/cloud_tasks/async_client.py index 1372f576..3c0b0375 100644 --- a/google/cloud/tasks_v2beta3/services/cloud_tasks/async_client.py +++ b/google/cloud/tasks_v2beta3/services/cloud_tasks/async_client.py @@ -16,7 +16,17 @@ from collections import OrderedDict import functools import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, +) from google.api_core import exceptions as core_exceptions from google.api_core import gapic_v1 @@ -168,9 +178,9 @@ def transport(self) -> CloudTasksTransport: def __init__( self, *, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, transport: Union[str, CloudTasksTransport] = "grpc_asyncio", - client_options: ClientOptions = None, + client_options: Optional[ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the cloud tasks client. @@ -214,11 +224,11 @@ def __init__( async def list_queues( self, - request: Union[cloudtasks.ListQueuesRequest, dict] = None, + request: Optional[Union[cloudtasks.ListQueuesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesAsyncPager: r"""Lists queues. @@ -252,7 +262,7 @@ async def sample_list_queues(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.ListQueuesRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.ListQueuesRequest, dict]]): The request object. Request message for [ListQueues][google.cloud.tasks.v2beta3.CloudTasks.ListQueues]. parent (:class:`str`): @@ -340,11 +350,11 @@ async def sample_list_queues(): async def get_queue( self, - request: Union[cloudtasks.GetQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.GetQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -376,7 +386,7 @@ async def sample_get_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.GetQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.GetQueueRequest, dict]]): The request object. Request message for [GetQueue][google.cloud.tasks.v2beta3.CloudTasks.GetQueue]. name (:class:`str`): @@ -456,12 +466,12 @@ async def sample_get_queue(): async def create_queue( self, - request: Union[cloudtasks.CreateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateQueueRequest, dict]] = None, *, - parent: str = None, - queue: gct_queue.Queue = None, + parent: Optional[str] = None, + queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -503,7 +513,7 @@ async def sample_create_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.CreateQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.CreateQueueRequest, dict]]): The request object. Request message for [CreateQueue][google.cloud.tasks.v2beta3.CloudTasks.CreateQueue]. parent (:class:`str`): @@ -589,12 +599,12 @@ async def sample_create_queue(): async def update_queue( self, - request: Union[cloudtasks.UpdateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.UpdateQueueRequest, dict]] = None, *, - queue: gct_queue.Queue = None, - update_mask: field_mask_pb2.FieldMask = None, + queue: Optional[gct_queue.Queue] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -638,7 +648,7 @@ async def sample_update_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.UpdateQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.UpdateQueueRequest, dict]]): The request object. Request message for [UpdateQueue][google.cloud.tasks.v2beta3.CloudTasks.UpdateQueue]. queue (:class:`google.cloud.tasks_v2beta3.types.Queue`): @@ -730,11 +740,11 @@ async def sample_update_queue(): async def delete_queue( self, - request: Union[cloudtasks.DeleteQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -774,7 +784,7 @@ async def sample_delete_queue(): await client.delete_queue(request=request) Args: - request (Union[google.cloud.tasks_v2beta3.types.DeleteQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.DeleteQueueRequest, dict]]): The request object. Request message for [DeleteQueue][google.cloud.tasks.v2beta3.CloudTasks.DeleteQueue]. name (:class:`str`): @@ -841,11 +851,11 @@ async def sample_delete_queue(): async def purge_queue( self, - request: Union[cloudtasks.PurgeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PurgeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -882,7 +892,7 @@ async def sample_purge_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.PurgeQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.PurgeQueueRequest, dict]]): The request object. Request message for [PurgeQueue][google.cloud.tasks.v2beta3.CloudTasks.PurgeQueue]. name (:class:`str`): @@ -952,11 +962,11 @@ async def sample_purge_queue(): async def pause_queue( self, - request: Union[cloudtasks.PauseQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PauseQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -995,7 +1005,7 @@ async def sample_pause_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.PauseQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.PauseQueueRequest, dict]]): The request object. Request message for [PauseQueue][google.cloud.tasks.v2beta3.CloudTasks.PauseQueue]. name (:class:`str`): @@ -1065,11 +1075,11 @@ async def sample_pause_queue(): async def resume_queue( self, - request: Union[cloudtasks.ResumeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.ResumeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1115,7 +1125,7 @@ async def sample_resume_queue(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.ResumeQueueRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.ResumeQueueRequest, dict]]): The request object. Request message for [ResumeQueue][google.cloud.tasks.v2beta3.CloudTasks.ResumeQueue]. name (:class:`str`): @@ -1185,11 +1195,11 @@ async def sample_resume_queue(): async def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1230,7 +1240,7 @@ async def sample_get_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]]): The request object. Request message for `GetIamPolicy` method. resource (:class:`str`): @@ -1369,11 +1379,11 @@ async def sample_get_iam_policy(): async def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1418,7 +1428,7 @@ async def sample_set_iam_policy(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]]): The request object. Request message for `SetIamPolicy` method. resource (:class:`str`): @@ -1547,12 +1557,12 @@ async def sample_set_iam_policy(): async def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, - resource: str = None, - permissions: Sequence[str] = None, + resource: Optional[str] = None, + permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1594,7 +1604,7 @@ async def sample_test_iam_permissions(): print(response) Args: - request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): + request (Optional[Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]]): The request object. Request message for `TestIamPermissions` method. resource (:class:`str`): @@ -1606,7 +1616,7 @@ async def sample_test_iam_permissions(): This corresponds to the ``resource`` field on the ``request`` instance; if ``request`` is provided, this should not be set. - permissions (:class:`Sequence[str]`): + permissions (:class:`MutableSequence[str]`): The set of permissions to check for the ``resource``. Permissions with wildcards (such as '*' or 'storage.*') are not allowed. For more information see `IAM @@ -1682,11 +1692,11 @@ async def sample_test_iam_permissions(): async def list_tasks( self, - request: Union[cloudtasks.ListTasksRequest, dict] = None, + request: Optional[Union[cloudtasks.ListTasksRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksAsyncPager: r"""Lists the tasks in a queue. @@ -1728,7 +1738,7 @@ async def sample_list_tasks(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.ListTasksRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.ListTasksRequest, dict]]): The request object. Request message for listing tasks using [ListTasks][google.cloud.tasks.v2beta3.CloudTasks.ListTasks]. @@ -1817,11 +1827,11 @@ async def sample_list_tasks(): async def get_task( self, - request: Union[cloudtasks.GetTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.GetTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -1853,7 +1863,7 @@ async def sample_get_task(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.GetTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.GetTaskRequest, dict]]): The request object. Request message for getting a task using [GetTask][google.cloud.tasks.v2beta3.CloudTasks.GetTask]. @@ -1928,12 +1938,12 @@ async def sample_get_task(): async def create_task( self, - request: Union[cloudtasks.CreateTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateTaskRequest, dict]] = None, *, - parent: str = None, - task: gct_task.Task = None, + parent: Optional[str] = None, + task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -1970,7 +1980,7 @@ async def sample_create_task(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.CreateTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.CreateTaskRequest, dict]]): The request object. Request message for [CreateTask][google.cloud.tasks.v2beta3.CloudTasks.CreateTask]. parent (:class:`str`): @@ -2084,11 +2094,11 @@ async def sample_create_task(): async def delete_task( self, - request: Union[cloudtasks.DeleteTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2120,7 +2130,7 @@ async def sample_delete_task(): await client.delete_task(request=request) Args: - request (Union[google.cloud.tasks_v2beta3.types.DeleteTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.DeleteTaskRequest, dict]]): The request object. Request message for deleting a task using [DeleteTask][google.cloud.tasks.v2beta3.CloudTasks.DeleteTask]. @@ -2188,11 +2198,11 @@ async def sample_delete_task(): async def run_task( self, - request: Union[cloudtasks.RunTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.RunTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -2251,7 +2261,7 @@ async def sample_run_task(): print(response) Args: - request (Union[google.cloud.tasks_v2beta3.types.RunTaskRequest, dict]): + request (Optional[Union[google.cloud.tasks_v2beta3.types.RunTaskRequest, dict]]): The request object. Request message for forcing a task to run now using [RunTask][google.cloud.tasks.v2beta3.CloudTasks.RunTask]. diff --git a/google/cloud/tasks_v2beta3/services/cloud_tasks/client.py b/google/cloud/tasks_v2beta3/services/cloud_tasks/client.py index 675a111f..afba7619 100644 --- a/google/cloud/tasks_v2beta3/services/cloud_tasks/client.py +++ b/google/cloud/tasks_v2beta3/services/cloud_tasks/client.py @@ -16,7 +16,18 @@ from collections import OrderedDict import os import re -from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import ( + Dict, + Mapping, + MutableMapping, + MutableSequence, + Optional, + Sequence, + Tuple, + Type, + Union, + cast, +) from google.api_core import client_options as client_options_lib from google.api_core import exceptions as core_exceptions @@ -67,7 +78,7 @@ class CloudTasksClientMeta(type): def get_transport_class( cls, - label: str = None, + label: Optional[str] = None, ) -> Type[CloudTasksTransport]: """Returns an appropriate transport class. @@ -368,8 +379,8 @@ def __init__( self, *, credentials: Optional[ga_credentials.Credentials] = None, - transport: Union[str, CloudTasksTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + transport: Optional[Union[str, CloudTasksTransport]] = None, + client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiates the cloud tasks client. @@ -383,7 +394,7 @@ def __init__( transport (Union[str, CloudTasksTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (google.api_core.client_options.ClientOptions): Custom options for the + client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT @@ -413,6 +424,7 @@ def __init__( client_options = client_options_lib.from_dict(client_options) if client_options is None: client_options = client_options_lib.ClientOptions() + client_options = cast(client_options_lib.ClientOptions, client_options) api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source( client_options @@ -465,11 +477,11 @@ def __init__( def list_queues( self, - request: Union[cloudtasks.ListQueuesRequest, dict] = None, + request: Optional[Union[cloudtasks.ListQueuesRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesPager: r"""Lists queues. @@ -581,11 +593,11 @@ def sample_list_queues(): def get_queue( self, - request: Union[cloudtasks.GetQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.GetQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -687,12 +699,12 @@ def sample_get_queue(): def create_queue( self, - request: Union[cloudtasks.CreateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateQueueRequest, dict]] = None, *, - parent: str = None, - queue: gct_queue.Queue = None, + parent: Optional[str] = None, + queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -820,12 +832,12 @@ def sample_create_queue(): def update_queue( self, - request: Union[cloudtasks.UpdateQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.UpdateQueueRequest, dict]] = None, *, - queue: gct_queue.Queue = None, - update_mask: field_mask_pb2.FieldMask = None, + queue: Optional[gct_queue.Queue] = None, + update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -961,11 +973,11 @@ def sample_update_queue(): def delete_queue( self, - request: Union[cloudtasks.DeleteQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -1062,11 +1074,11 @@ def sample_delete_queue(): def purge_queue( self, - request: Union[cloudtasks.PurgeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PurgeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -1173,11 +1185,11 @@ def sample_purge_queue(): def pause_queue( self, - request: Union[cloudtasks.PauseQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.PauseQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1286,11 +1298,11 @@ def sample_pause_queue(): def resume_queue( self, - request: Union[cloudtasks.ResumeQueueRequest, dict] = None, + request: Optional[Union[cloudtasks.ResumeQueueRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1406,11 +1418,11 @@ def sample_resume_queue(): def get_iam_policy( self, - request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1577,11 +1589,11 @@ def sample_get_iam_policy(): def set_iam_policy( self, - request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None, *, - resource: str = None, + resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1752,12 +1764,12 @@ def sample_set_iam_policy(): def test_iam_permissions( self, - request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, + request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None, *, - resource: str = None, - permissions: Sequence[str] = None, + resource: Optional[str] = None, + permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1811,7 +1823,7 @@ def sample_test_iam_permissions(): This corresponds to the ``resource`` field on the ``request`` instance; if ``request`` is provided, this should not be set. - permissions (Sequence[str]): + permissions (MutableSequence[str]): The set of permissions to check for the ``resource``. Permissions with wildcards (such as '*' or 'storage.*') are not allowed. For more information see `IAM @@ -1875,11 +1887,11 @@ def sample_test_iam_permissions(): def list_tasks( self, - request: Union[cloudtasks.ListTasksRequest, dict] = None, + request: Optional[Union[cloudtasks.ListTasksRequest, dict]] = None, *, - parent: str = None, + parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksPager: r"""Lists the tasks in a queue. @@ -2000,11 +2012,11 @@ def sample_list_tasks(): def get_task( self, - request: Union[cloudtasks.GetTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.GetTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -2101,12 +2113,12 @@ def sample_get_task(): def create_task( self, - request: Union[cloudtasks.CreateTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.CreateTaskRequest, dict]] = None, *, - parent: str = None, - task: gct_task.Task = None, + parent: Optional[str] = None, + task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2257,11 +2269,11 @@ def sample_create_task(): def delete_task( self, - request: Union[cloudtasks.DeleteTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.DeleteTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2351,11 +2363,11 @@ def sample_delete_task(): def run_task( self, - request: Union[cloudtasks.RunTaskRequest, dict] = None, + request: Optional[Union[cloudtasks.RunTaskRequest, dict]] = None, *, - name: str = None, + name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: float = None, + timeout: Optional[float] = None, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. diff --git a/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/base.py b/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/base.py index bb7135a8..ed0ea228 100644 --- a/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/base.py +++ b/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/base.py @@ -55,7 +55,7 @@ def __init__( self, *, host: str = DEFAULT_HOST, - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, diff --git a/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/grpc.py b/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/grpc.py index 83754d4c..adfe139f 100644 --- a/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/grpc.py +++ b/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/grpc.py @@ -54,14 +54,14 @@ def __init__( self, *, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, - scopes: Sequence[str] = None, - channel: grpc.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, + scopes: Optional[Sequence[str]] = None, + channel: Optional[grpc.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, @@ -188,8 +188,8 @@ def __init__( def create_channel( cls, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, - credentials_file: str = None, + credentials: Optional[ga_credentials.Credentials] = None, + credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, **kwargs, diff --git a/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/grpc_asyncio.py b/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/grpc_asyncio.py index 04914274..a4183721 100644 --- a/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/grpc_asyncio.py +++ b/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/grpc_asyncio.py @@ -56,7 +56,7 @@ class CloudTasksGrpcAsyncIOTransport(CloudTasksTransport): def create_channel( cls, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, quota_project_id: Optional[str] = None, @@ -99,15 +99,15 @@ def __init__( self, *, host: str = "cloudtasks.googleapis.com", - credentials: ga_credentials.Credentials = None, + credentials: Optional[ga_credentials.Credentials] = None, credentials_file: Optional[str] = None, scopes: Optional[Sequence[str]] = None, - channel: aio.Channel = None, - api_mtls_endpoint: str = None, - client_cert_source: Callable[[], Tuple[bytes, bytes]] = None, - ssl_channel_credentials: grpc.ChannelCredentials = None, - client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None, - quota_project_id=None, + channel: Optional[aio.Channel] = None, + api_mtls_endpoint: Optional[str] = None, + client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None, + client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None, + quota_project_id: Optional[str] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, always_use_jwt_access: Optional[bool] = False, api_audience: Optional[str] = None, diff --git a/google/cloud/tasks_v2beta3/types/cloudtasks.py b/google/cloud/tasks_v2beta3/types/cloudtasks.py index 663e2124..a9afb941 100644 --- a/google/cloud/tasks_v2beta3/types/cloudtasks.py +++ b/google/cloud/tasks_v2beta3/types/cloudtasks.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import field_mask_pb2 # type: ignore import proto # type: ignore @@ -88,23 +90,23 @@ class ListQueuesRequest(proto.Message): returned only if it was explicitly specified in the mask. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - filter = proto.Field( + filter: str = proto.Field( proto.STRING, number=2, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=3, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=4, ) - read_mask = proto.Field( + read_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=5, message=field_mask_pb2.FieldMask, @@ -116,7 +118,7 @@ class ListQueuesResponse(proto.Message): [ListQueues][google.cloud.tasks.v2beta3.CloudTasks.ListQueues]. Attributes: - queues (Sequence[google.cloud.tasks_v2beta3.types.Queue]): + queues (MutableSequence[google.cloud.tasks_v2beta3.types.Queue]): The list of queues. next_page_token (str): A token to retrieve next page of results. @@ -135,12 +137,12 @@ class ListQueuesResponse(proto.Message): def raw_page(self): return self - queues = proto.RepeatedField( + queues: MutableSequence[gct_queue.Queue] = proto.RepeatedField( proto.MESSAGE, number=1, message=gct_queue.Queue, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -161,11 +163,11 @@ class GetQueueRequest(proto.Message): returned only if it was explicitly specified in the mask. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - read_mask = proto.Field( + read_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -192,11 +194,11 @@ class CreateQueueRequest(proto.Message): be the same as an existing queue. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - queue = proto.Field( + queue: gct_queue.Queue = proto.Field( proto.MESSAGE, number=2, message=gct_queue.Queue, @@ -224,12 +226,12 @@ class UpdateQueueRequest(proto.Message): If empty, then all fields will be updated. """ - queue = proto.Field( + queue: gct_queue.Queue = proto.Field( proto.MESSAGE, number=1, message=gct_queue.Queue, ) - update_mask = proto.Field( + update_mask: field_mask_pb2.FieldMask = proto.Field( proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, @@ -246,7 +248,7 @@ class DeleteQueueRequest(proto.Message): ``projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -262,7 +264,7 @@ class PurgeQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -278,7 +280,7 @@ class PauseQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -294,7 +296,7 @@ class ResumeQueueRequest(proto.Message): ``projects/PROJECT_ID/location/LOCATION_ID/queues/QUEUE_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -348,20 +350,20 @@ class ListTasksRequest(proto.Message): The page token is valid for only 2 hours. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, ) - page_size = proto.Field( + page_size: int = proto.Field( proto.INT32, number=3, ) - page_token = proto.Field( + page_token: str = proto.Field( proto.STRING, number=4, ) @@ -372,7 +374,7 @@ class ListTasksResponse(proto.Message): [ListTasks][google.cloud.tasks.v2beta3.CloudTasks.ListTasks]. Attributes: - tasks (Sequence[google.cloud.tasks_v2beta3.types.Task]): + tasks (MutableSequence[google.cloud.tasks_v2beta3.types.Task]): The list of tasks. next_page_token (str): A token to retrieve next page of results. @@ -389,12 +391,12 @@ class ListTasksResponse(proto.Message): def raw_page(self): return self - tasks = proto.RepeatedField( + tasks: MutableSequence[gct_task.Task] = proto.RepeatedField( proto.MESSAGE, number=1, message=gct_task.Task, ) - next_page_token = proto.Field( + next_page_token: str = proto.Field( proto.STRING, number=2, ) @@ -426,11 +428,11 @@ class GetTaskRequest(proto.Message): [Task][google.cloud.tasks.v2beta3.Task] resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, @@ -506,16 +508,16 @@ class CreateTaskRequest(proto.Message): [Task][google.cloud.tasks.v2beta3.Task] resource. """ - parent = proto.Field( + parent: str = proto.Field( proto.STRING, number=1, ) - task = proto.Field( + task: gct_task.Task = proto.Field( proto.MESSAGE, number=2, message=gct_task.Task, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=3, enum=gct_task.Task.View, @@ -532,7 +534,7 @@ class DeleteTaskRequest(proto.Message): ``projects/PROJECT_ID/locations/LOCATION_ID/queues/QUEUE_ID/tasks/TASK_ID`` """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) @@ -564,11 +566,11 @@ class RunTaskRequest(proto.Message): [Task][google.cloud.tasks.v2beta3.Task] resource. """ - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - response_view = proto.Field( + response_view: gct_task.Task.View = proto.Field( proto.ENUM, number=2, enum=gct_task.Task.View, diff --git a/google/cloud/tasks_v2beta3/types/queue.py b/google/cloud/tasks_v2beta3/types/queue.py index f2aed3c0..ca11bab6 100644 --- a/google/cloud/tasks_v2beta3/types/queue.py +++ b/google/cloud/tasks_v2beta3/types/queue.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore import proto # type: ignore @@ -200,57 +202,57 @@ class Type(proto.Enum): PULL = 1 PUSH = 2 - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - app_engine_http_queue = proto.Field( + app_engine_http_queue: target.AppEngineHttpQueue = proto.Field( proto.MESSAGE, number=3, oneof="queue_type", message=target.AppEngineHttpQueue, ) - rate_limits = proto.Field( + rate_limits: "RateLimits" = proto.Field( proto.MESSAGE, number=4, message="RateLimits", ) - retry_config = proto.Field( + retry_config: "RetryConfig" = proto.Field( proto.MESSAGE, number=5, message="RetryConfig", ) - state = proto.Field( + state: State = proto.Field( proto.ENUM, number=6, enum=State, ) - purge_time = proto.Field( + purge_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=7, message=timestamp_pb2.Timestamp, ) - task_ttl = proto.Field( + task_ttl: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=8, message=duration_pb2.Duration, ) - tombstone_ttl = proto.Field( + tombstone_ttl: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=9, message=duration_pb2.Duration, ) - stackdriver_logging_config = proto.Field( + stackdriver_logging_config: "StackdriverLoggingConfig" = proto.Field( proto.MESSAGE, number=10, message="StackdriverLoggingConfig", ) - type_ = proto.Field( + type_: Type = proto.Field( proto.ENUM, number=11, enum=Type, ) - stats = proto.Field( + stats: "QueueStats" = proto.Field( proto.MESSAGE, number=12, message="QueueStats", @@ -337,15 +339,15 @@ class RateLimits(proto.Message): queue.yaml/xml `__. """ - max_dispatches_per_second = proto.Field( + max_dispatches_per_second: float = proto.Field( proto.DOUBLE, number=1, ) - max_burst_size = proto.Field( + max_burst_size: int = proto.Field( proto.INT32, number=2, ) - max_concurrent_dispatches = proto.Field( + max_concurrent_dispatches: int = proto.Field( proto.INT32, number=3, ) @@ -459,26 +461,26 @@ class RetryConfig(proto.Message): queue.yaml/xml `__. """ - max_attempts = proto.Field( + max_attempts: int = proto.Field( proto.INT32, number=1, ) - max_retry_duration = proto.Field( + max_retry_duration: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=2, message=duration_pb2.Duration, ) - min_backoff = proto.Field( + min_backoff: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=3, message=duration_pb2.Duration, ) - max_backoff = proto.Field( + max_backoff: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=4, message=duration_pb2.Duration, ) - max_doublings = proto.Field( + max_doublings: int = proto.Field( proto.INT32, number=5, ) @@ -497,7 +499,7 @@ class StackdriverLoggingConfig(proto.Message): 0.0 is the default and means that no operations are logged. """ - sampling_ratio = proto.Field( + sampling_ratio: float = proto.Field( proto.DOUBLE, number=1, ) @@ -536,24 +538,24 @@ class QueueStats(proto.Message): tasks in the queue are targeting. """ - tasks_count = proto.Field( + tasks_count: int = proto.Field( proto.INT64, number=1, ) - oldest_estimated_arrival_time = proto.Field( + oldest_estimated_arrival_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, ) - executed_last_minute_count = proto.Field( + executed_last_minute_count: int = proto.Field( proto.INT64, number=3, ) - concurrent_dispatches_count = proto.Field( + concurrent_dispatches_count: int = proto.Field( proto.INT64, number=4, ) - effective_execution_rate = proto.Field( + effective_execution_rate: float = proto.Field( proto.DOUBLE, number=5, ) diff --git a/google/cloud/tasks_v2beta3/types/target.py b/google/cloud/tasks_v2beta3/types/target.py index 0268791f..6d2e871e 100644 --- a/google/cloud/tasks_v2beta3/types/target.py +++ b/google/cloud/tasks_v2beta3/types/target.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + import proto # type: ignore __protobuf__ = proto.module( @@ -70,11 +72,11 @@ class PullMessage(proto.Message): returned by Cloud Tasks. """ - payload = proto.Field( + payload: bytes = proto.Field( proto.BYTES, number=1, ) - tag = proto.Field( + tag: str = proto.Field( proto.STRING, number=2, ) @@ -140,7 +142,7 @@ class HttpRequest(proto.Message): http_method (google.cloud.tasks_v2beta3.types.HttpMethod): The HTTP method to use for the request. The default is POST. - headers (Mapping[str, str]): + headers (MutableMapping[str, str]): HTTP request headers. This map contains the header field names and values. Headers @@ -204,31 +206,31 @@ class HttpRequest(proto.Message): This field is a member of `oneof`_ ``authorization_header``. """ - url = proto.Field( + url: str = proto.Field( proto.STRING, number=1, ) - http_method = proto.Field( + http_method: "HttpMethod" = proto.Field( proto.ENUM, number=2, enum="HttpMethod", ) - headers = proto.MapField( + headers: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=3, ) - body = proto.Field( + body: bytes = proto.Field( proto.BYTES, number=4, ) - oauth_token = proto.Field( + oauth_token: "OAuthToken" = proto.Field( proto.MESSAGE, number=5, oneof="authorization_header", message="OAuthToken", ) - oidc_token = proto.Field( + oidc_token: "OidcToken" = proto.Field( proto.MESSAGE, number=6, oneof="authorization_header", @@ -267,7 +269,7 @@ class AppEngineHttpQueue(proto.Message): app_engine_routing][google.cloud.tasks.v2beta3.AppEngineHttpRequest.app_engine_routing]. """ - app_engine_routing_override = proto.Field( + app_engine_routing_override: "AppEngineRouting" = proto.Field( proto.MESSAGE, number=1, message="AppEngineRouting", @@ -366,7 +368,7 @@ class AppEngineHttpRequest(proto.Message): is empty, then the root path "/" will be used. No spaces are allowed, and the maximum length allowed is 2083 characters. - headers (Mapping[str, str]): + headers (MutableMapping[str, str]): HTTP request headers. This map contains the header field names and values. Headers @@ -426,26 +428,26 @@ class AppEngineHttpRequest(proto.Message): [HttpMethod][google.cloud.tasks.v2beta3.HttpMethod]. """ - http_method = proto.Field( + http_method: "HttpMethod" = proto.Field( proto.ENUM, number=1, enum="HttpMethod", ) - app_engine_routing = proto.Field( + app_engine_routing: "AppEngineRouting" = proto.Field( proto.MESSAGE, number=2, message="AppEngineRouting", ) - relative_uri = proto.Field( + relative_uri: str = proto.Field( proto.STRING, number=3, ) - headers = proto.MapField( + headers: MutableMapping[str, str] = proto.MapField( proto.STRING, proto.STRING, number=4, ) - body = proto.Field( + body: bytes = proto.Field( proto.BYTES, number=5, ) @@ -547,19 +549,19 @@ class AppEngineRouting(proto.Message): Routed `__. """ - service = proto.Field( + service: str = proto.Field( proto.STRING, number=1, ) - version = proto.Field( + version: str = proto.Field( proto.STRING, number=2, ) - instance = proto.Field( + instance: str = proto.Field( proto.STRING, number=3, ) - host = proto.Field( + host: str = proto.Field( proto.STRING, number=4, ) @@ -586,11 +588,11 @@ class OAuthToken(proto.Message): will be used. """ - service_account_email = proto.Field( + service_account_email: str = proto.Field( proto.STRING, number=1, ) - scope = proto.Field( + scope: str = proto.Field( proto.STRING, number=2, ) @@ -617,11 +619,11 @@ class OidcToken(proto.Message): target will be used. """ - service_account_email = proto.Field( + service_account_email: str = proto.Field( proto.STRING, number=1, ) - audience = proto.Field( + audience: str = proto.Field( proto.STRING, number=2, ) diff --git a/google/cloud/tasks_v2beta3/types/task.py b/google/cloud/tasks_v2beta3/types/task.py index 6f651136..7b3a2cff 100644 --- a/google/cloud/tasks_v2beta3/types/task.py +++ b/google/cloud/tasks_v2beta3/types/task.py @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +from typing import MutableMapping, MutableSequence + from google.protobuf import duration_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore from google.rpc import status_pb2 # type: ignore @@ -180,62 +182,62 @@ class View(proto.Enum): BASIC = 1 FULL = 2 - name = proto.Field( + name: str = proto.Field( proto.STRING, number=1, ) - app_engine_http_request = proto.Field( + app_engine_http_request: target.AppEngineHttpRequest = proto.Field( proto.MESSAGE, number=3, oneof="payload_type", message=target.AppEngineHttpRequest, ) - http_request = proto.Field( + http_request: target.HttpRequest = proto.Field( proto.MESSAGE, number=11, oneof="payload_type", message=target.HttpRequest, ) - pull_message = proto.Field( + pull_message: target.PullMessage = proto.Field( proto.MESSAGE, number=13, oneof="payload_type", message=target.PullMessage, ) - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp, ) - create_time = proto.Field( + create_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=5, message=timestamp_pb2.Timestamp, ) - dispatch_deadline = proto.Field( + dispatch_deadline: duration_pb2.Duration = proto.Field( proto.MESSAGE, number=12, message=duration_pb2.Duration, ) - dispatch_count = proto.Field( + dispatch_count: int = proto.Field( proto.INT32, number=6, ) - response_count = proto.Field( + response_count: int = proto.Field( proto.INT32, number=7, ) - first_attempt = proto.Field( + first_attempt: "Attempt" = proto.Field( proto.MESSAGE, number=8, message="Attempt", ) - last_attempt = proto.Field( + last_attempt: "Attempt" = proto.Field( proto.MESSAGE, number=9, message="Attempt", ) - view = proto.Field( + view: View = proto.Field( proto.ENUM, number=10, enum=View, @@ -270,22 +272,22 @@ class Attempt(proto.Message): ``response_status`` field is meaningless. """ - schedule_time = proto.Field( + schedule_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=1, message=timestamp_pb2.Timestamp, ) - dispatch_time = proto.Field( + dispatch_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, ) - response_time = proto.Field( + response_time: timestamp_pb2.Timestamp = proto.Field( proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp, ) - response_status = proto.Field( + response_status: status_pb2.Status = proto.Field( proto.MESSAGE, number=4, message=status_pb2.Status, diff --git a/owlbot.py b/owlbot.py new file mode 100644 index 00000000..ce738f01 --- /dev/null +++ b/owlbot.py @@ -0,0 +1,56 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +from pathlib import Path +import shutil + +import synthtool as s +import synthtool.gcp as gcp +from synthtool.languages import python + +# ---------------------------------------------------------------------------- +# Copy the generated client from the owl-bot staging directory +# ---------------------------------------------------------------------------- + +clean_up_generated_samples = True + +# Load the default version defined in .repo-metadata.json. +default_version = json.load(open(".repo-metadata.json", "rt")).get( + "default_version" +) + +for library in s.get_staging_dirs(default_version): + if clean_up_generated_samples: + shutil.rmtree("samples/generated_samples", ignore_errors=True) + clean_up_generated_samples = False + s.move([library], excludes=["**/gapic_version.py"]) +s.remove_staging_dirs() + +# ---------------------------------------------------------------------------- +# Add templated files +# ---------------------------------------------------------------------------- + +templated_files = gcp.CommonTemplates().py_library( + cov_level=100, + microgenerator=True, + versions=gcp.common.detect_versions(path="./google", default_first=True), +) +s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml"]) + +python.py_samples(skip_readmes=True) + +# 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/release-please-config.json b/release-please-config.json new file mode 100644 index 00000000..d2b0548c --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,33 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "packages": { + ".": { + "release-type": "python", + "extra-files": [ + "google/cloud/tasks/gapic_version.py", + { + "type": "json", + "path": "samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json", + "jsonpath": "$.clientLibrary.version" + }, + { + "type": "json", + "path": "samples/generated_samples/snippet_metadata_google.cloud.tasks.v2.json", + "jsonpath": "$.clientLibrary.version" + }, + { + "type": "json", + "path": "samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta3.json", + "jsonpath": "$.clientLibrary.version" + } + ] + } + }, + "release-type": "python", + "plugins": [ + { + "type": "sentence-case" + } + ], + "initial-version": "0.1.0" +} diff --git a/samples/generated_samples/snippet_metadata_tasks_v2.json b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2.json similarity index 99% rename from samples/generated_samples/snippet_metadata_tasks_v2.json rename to samples/generated_samples/snippet_metadata_google.cloud.tasks.v2.json index b8eb3ec1..164c51d1 100644 --- a/samples/generated_samples/snippet_metadata_tasks_v2.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2.json @@ -7,7 +7,8 @@ } ], "language": "PYTHON", - "name": "google-cloud-tasks" + "name": "google-cloud-tasks", + "version": "0.1.0" }, "snippets": [ { @@ -2296,7 +2297,7 @@ }, { "name": "permissions", - "type": "Sequence[str]" + "type": "MutableSequence[str]" }, { "name": "retry", @@ -2380,7 +2381,7 @@ }, { "name": "permissions", - "type": "Sequence[str]" + "type": "MutableSequence[str]" }, { "name": "retry", diff --git a/samples/generated_samples/snippet_metadata_tasks_v2beta2.json b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json similarity index 99% rename from samples/generated_samples/snippet_metadata_tasks_v2beta2.json rename to samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json index cd85003e..006a84eb 100644 --- a/samples/generated_samples/snippet_metadata_tasks_v2beta2.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json @@ -7,7 +7,8 @@ } ], "language": "PYTHON", - "name": "google-cloud-tasks" + "name": "google-cloud-tasks", + "version": "0.1.0" }, "snippets": [ { @@ -2974,7 +2975,7 @@ }, { "name": "permissions", - "type": "Sequence[str]" + "type": "MutableSequence[str]" }, { "name": "retry", @@ -3058,7 +3059,7 @@ }, { "name": "permissions", - "type": "Sequence[str]" + "type": "MutableSequence[str]" }, { "name": "retry", diff --git a/samples/generated_samples/snippet_metadata_tasks_v2beta3.json b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta3.json similarity index 99% rename from samples/generated_samples/snippet_metadata_tasks_v2beta3.json rename to samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta3.json index f15958c4..788516ef 100644 --- a/samples/generated_samples/snippet_metadata_tasks_v2beta3.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta3.json @@ -7,7 +7,8 @@ } ], "language": "PYTHON", - "name": "google-cloud-tasks" + "name": "google-cloud-tasks", + "version": "0.1.0" }, "snippets": [ { @@ -2296,7 +2297,7 @@ }, { "name": "permissions", - "type": "Sequence[str]" + "type": "MutableSequence[str]" }, { "name": "retry", @@ -2380,7 +2381,7 @@ }, { "name": "permissions", - "type": "Sequence[str]" + "type": "MutableSequence[str]" }, { "name": "retry", diff --git a/setup.py b/setup.py index 0faaf952..85a42c1e 100644 --- a/setup.py +++ b/setup.py @@ -1,36 +1,47 @@ # -*- coding: utf-8 -*- -# -# Copyright 2018 Google LLC +# Copyright 2022 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# https://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +# import io import os -import setuptools +import setuptools # type: ignore + +package_root = os.path.abspath(os.path.dirname(__file__)) name = "google-cloud-tasks" -description = "Cloud Tasks API API client library" -version = "2.10.4" -release_status = "Development Status :: 5 - Production/Stable" + + +description = "Google Cloud Tasks API client library" + +version = {} +with open(os.path.join(package_root, "google/cloud/tasks/gapic_version.py")) as fp: + exec(fp.read(), version) +version = version["__version__"] + +if version[0] == "0": + release_status = "Development Status :: 4 - Beta" +else: + release_status = "Development Status :: 5 - Production/Stable" + dependencies = [ - "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", - "grpc-google-iam-v1 >= 0.12.4, <1.0.0dev", + "google-api-core[grpc] >= 1.33.2, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", "proto-plus >= 1.22.0, <2.0.0dev", "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", + "grpc-google-iam-v1 >= 0.12.4, < 1.0.0dev", ] - -extras = {"libcst": "libcst >= 0.2.5"} +url = "https://github.com/googleapis/python-tasks" package_root = os.path.abspath(os.path.dirname(__file__)) @@ -56,7 +67,7 @@ author="Google LLC", author_email="googleapis-packages@google.com", license="Apache 2.0", - url="https://github.com/googleapis/python-tasks", + url=url, classifiers=[ release_status, "Intended Audience :: Developers", @@ -72,14 +83,9 @@ ], platforms="Posix; MacOS X; Windows", packages=packages, + python_requires=">=3.7", namespace_packages=namespaces, install_requires=dependencies, - python_requires=">=3.7", - scripts=[ - "scripts/fixup_tasks_v2_keywords.py", - "scripts/fixup_tasks_v2beta2_keywords.py", - "scripts/fixup_tasks_v2beta3_keywords.py", - ], include_package_data=True, zip_safe=False, ) diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt index e69de29b..ad3f0fa5 100644 --- a/testing/constraints-3.10.txt +++ b/testing/constraints-3.10.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/testing/constraints-3.11.txt b/testing/constraints-3.11.txt index e69de29b..ad3f0fa5 100644 --- a/testing/constraints-3.11.txt +++ b/testing/constraints-3.11.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 90f4b6d9..883a87ae 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -1,12 +1,10 @@ # This constraints file is used to check that lower bounds # are correct in setup.py -# List *all* library dependencies and extras in this file. +# List all library dependencies and extras in this file. # Pin the version to the lower bound. -# -# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", -# Then this file should have foo==1.14.0 -google-api-core==1.32.0 -grpc-google-iam-v1==0.12.4 +# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev", +# Then this file should have google-cloud-foo==1.14.0 +google-api-core==1.33.2 proto-plus==1.22.0 -libcst==0.2.5 protobuf==3.19.5 +grpc-google-iam-v1==0.12.4 diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt index e69de29b..ad3f0fa5 100644 --- a/testing/constraints-3.8.txt +++ b/testing/constraints-3.8.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt index e69de29b..ad3f0fa5 100644 --- a/testing/constraints-3.9.txt +++ b/testing/constraints-3.9.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1 From 376d8c6812614585b9424c243b99440c62db913a Mon Sep 17 00:00:00 2001 From: Sampath Kumar Date: Wed, 7 Dec 2022 21:35:16 +0100 Subject: [PATCH 07/11] chore: Repo clean up code snippet that are migrated to python-docs-samples (#317) * Repo clean up - code samples are migrated to https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/cloud_tasks/snippets For more details, check http://b/257074671 * Add README.md --- samples/AUTHORING_GUIDE.md | 1 - samples/CONTRIBUTING.md | 1 - samples/README.md | 4 + samples/snippets/README.md | 87 ------ samples/snippets/create_http_task.py | 155 ---------- samples/snippets/create_http_task_test.py | 60 ---- .../snippets/create_http_task_with_token.py | 73 ----- .../create_http_task_with_token_test.py | 51 --- samples/snippets/create_queue.py | 37 --- samples/snippets/create_queue_test.py | 40 --- samples/snippets/delete_queue.py | 32 -- samples/snippets/delete_queue_test.py | 52 ---- samples/snippets/list_queues.py | 40 --- samples/snippets/list_queues_test.py | 54 ---- samples/snippets/noxfile.py | 292 ------------------ samples/snippets/requirements-test.txt | 1 - samples/snippets/requirements.txt | 1 - 17 files changed, 4 insertions(+), 977 deletions(-) delete mode 100644 samples/AUTHORING_GUIDE.md delete mode 100644 samples/CONTRIBUTING.md create mode 100644 samples/README.md delete mode 100644 samples/snippets/README.md delete mode 100644 samples/snippets/create_http_task.py delete mode 100644 samples/snippets/create_http_task_test.py delete mode 100644 samples/snippets/create_http_task_with_token.py delete mode 100644 samples/snippets/create_http_task_with_token_test.py delete mode 100644 samples/snippets/create_queue.py delete mode 100644 samples/snippets/create_queue_test.py delete mode 100644 samples/snippets/delete_queue.py delete mode 100644 samples/snippets/delete_queue_test.py delete mode 100644 samples/snippets/list_queues.py delete mode 100644 samples/snippets/list_queues_test.py delete mode 100644 samples/snippets/noxfile.py delete mode 100644 samples/snippets/requirements-test.txt delete mode 100644 samples/snippets/requirements.txt diff --git a/samples/AUTHORING_GUIDE.md b/samples/AUTHORING_GUIDE.md deleted file mode 100644 index 55c97b32..00000000 --- a/samples/AUTHORING_GUIDE.md +++ /dev/null @@ -1 +0,0 @@ -See https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md \ No newline at end of file diff --git a/samples/CONTRIBUTING.md b/samples/CONTRIBUTING.md deleted file mode 100644 index 34c882b6..00000000 --- a/samples/CONTRIBUTING.md +++ /dev/null @@ -1 +0,0 @@ -See https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/CONTRIBUTING.md \ No newline at end of file diff --git a/samples/README.md b/samples/README.md new file mode 100644 index 00000000..8d4b4622 --- /dev/null +++ b/samples/README.md @@ -0,0 +1,4 @@ +Samples migrated +================ + +New location: https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/cloud_tasks/snippets \ No newline at end of file diff --git a/samples/snippets/README.md b/samples/snippets/README.md deleted file mode 100644 index b83eae65..00000000 --- a/samples/snippets/README.md +++ /dev/null @@ -1,87 +0,0 @@ -# Google Cloud Tasks Samples - -[![Open in Cloud Shell][shell_img]][shell_link] - -[shell_img]: http://gstatic.com/cloudssh/images/open-btn.png -[shell_link]: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=tasks/README.md - -This sample demonstrates how to use the -[Cloud Tasks](https://cloud.google.com/tasks/docs/) client library. - -`create_http_task.py` is a simple command-line program to create -tasks to be pushed to an URL endpoint. - -`create_http_task_with_token.py` is a simple command-line program to create -tasks to be pushed to an URL endpoint with authorization header. - -## Prerequisites to run locally: - -Please refer to [Setting Up a Python Development Environment](https://cloud.google.com/python/setup). - -## Authentication - -To set up authentication, please refer to our -[authentication getting started guide](https://cloud.google.com/docs/authentication/getting-started). - -## Install Dependencies - -To install the dependencies for this sample, use the following command: - -``` -pip install -r requirements.txt -``` - -This sample uses the common protos in the [googleapis](https://github.com/googleapis/googleapis) -repository. For more info, see -[Protocol Buffer Basics](https://developers.google.com/protocol-buffers/docs/pythontutorial). - -## Creating a queue - -To create a queue (named `my-queue`) using the Cloud SDK, use the following -gcloud command: - -``` -gcloud tasks queues create my-queue -``` - -## Run the Sample Using the Command Line - -Set environment variables: - -First, your project ID: - -``` -export PROJECT_ID=my-project-id -``` - -Then the queue ID, as specified at queue creation time. Queue IDs already -created can be listed with `gcloud tasks queues list`. - -``` -export QUEUE_ID=my-queue -``` - -And finally the location ID, which can be discovered with -`gcloud tasks queues describe my-queue`, with the location embedded in -the "name" value (for instance, if the name is -"projects/my-project/locations/us-central1/queues/my-queue", then the -location is "us-central1"). - -``` -export LOCATION_ID=us-central1 -``` - -### Creating Tasks with HTTP Targets - -Set an environment variable for the endpoint to your task handler. This is an -example url: -``` -export URL=https://example.com/task_handler -``` - -Running the sample will create a task and send the task to the specific URL -endpoint, with a payload specified: - -``` -python create_http_task.py --project=$PROJECT_ID --queue=$QUEUE_ID --location=$LOCATION_ID --url=$URL --payload=hello -``` diff --git a/samples/snippets/create_http_task.py b/samples/snippets/create_http_task.py deleted file mode 100644 index a789c4ee..00000000 --- a/samples/snippets/create_http_task.py +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 2019 Google LLC All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from __future__ import print_function - -import argparse - - -def create_http_task( - project, - queue, - location, - url, - payload=None, - in_seconds=None, - task_name=None, - deadline=None, -): - # [START cloud_tasks_create_http_task] - """Create a task for a given queue with an arbitrary payload.""" - - import datetime - import json - - from google.cloud import tasks_v2 - from google.protobuf import duration_pb2, timestamp_pb2 - - # Create a client. - client = tasks_v2.CloudTasksClient() - - # TODO(developer): Uncomment these lines and replace with your values. - # project = 'my-project-id' - # queue = 'my-queue' - # location = 'us-central1' - # url = 'https://example.com/task_handler' - # payload = 'hello' or {'param': 'value'} for application/json - # in_seconds = 180 - # task_name = 'my-unique-task' - # deadline = 900 - - # Construct the fully qualified queue name. - parent = client.queue_path(project, location, queue) - - # Construct the request body. - task = { - "http_request": { # Specify the type of request. - "http_method": tasks_v2.HttpMethod.POST, - "url": url, # The full url path that the task will be sent to. - } - } - if payload is not None: - if isinstance(payload, dict): - # Convert dict to JSON string - payload = json.dumps(payload) - # specify http content-type to application/json - task["http_request"]["headers"] = {"Content-type": "application/json"} - - # The API expects a payload of type bytes. - converted_payload = payload.encode() - - # Add the payload to the request. - task["http_request"]["body"] = converted_payload - - if in_seconds is not None: - # Convert "seconds from now" into an rfc3339 datetime string. - d = datetime.datetime.utcnow() + datetime.timedelta(seconds=in_seconds) - - # Create Timestamp protobuf. - timestamp = timestamp_pb2.Timestamp() - timestamp.FromDatetime(d) - - # Add the timestamp to the tasks. - task["schedule_time"] = timestamp - - if task_name is not None: - # Add the name to tasks. - task["name"] = client.task_path(project, location, queue, task_name) - - if deadline is not None: - # Add dispatch deadline for requests sent to the worker. - duration = duration_pb2.Duration() - duration.FromSeconds(deadline) - task["dispatch_deadline"] = duration - - # Use the client to build and send the task. - response = client.create_task(request={"parent": parent, "task": task}) - - print("Created task {}".format(response.name)) - # [END cloud_tasks_create_http_task] - return response - - -if __name__ == "__main__": - parser = argparse.ArgumentParser( - description=create_http_task.__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - - parser.add_argument( - "--project", - help="Project of the queue to add the task to.", - required=True, - ) - - parser.add_argument( - "--queue", - help="ID (short name) of the queue to add the task to.", - required=True, - ) - - parser.add_argument( - "--location", - help="Location of the queue to add the task to.", - required=True, - ) - - parser.add_argument( - "--url", - help="The full url path that the request will be sent to.", - required=True, - ) - - parser.add_argument( - "--payload", help="Optional payload to attach to the push queue." - ) - - parser.add_argument( - "--in_seconds", - type=int, - help="The number of seconds from now to schedule task attempt.", - ) - - parser.add_argument("--task_name", help="Task name of the task to create") - args = parser.parse_args() - - create_http_task( - args.project, - args.queue, - args.location, - args.url, - args.payload, - args.in_seconds, - args.task_name, - ) diff --git a/samples/snippets/create_http_task_test.py b/samples/snippets/create_http_task_test.py deleted file mode 100644 index a66f3287..00000000 --- a/samples/snippets/create_http_task_test.py +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2019 Google LLC All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import uuid - -from google.cloud import tasks_v2 -import pytest - -import create_http_task - -TEST_PROJECT_ID = os.getenv("GOOGLE_CLOUD_PROJECT") -TEST_LOCATION = os.getenv("TEST_QUEUE_LOCATION", "us-central1") -TEST_QUEUE_NAME = f"my-queue-{uuid.uuid4().hex}" - - -@pytest.fixture() -def test_queue(): - client = tasks_v2.CloudTasksClient() - parent = f"projects/{TEST_PROJECT_ID}/locations/{TEST_LOCATION}" - queue = { - # The fully qualified path to the queue - "name": client.queue_path(TEST_PROJECT_ID, TEST_LOCATION, TEST_QUEUE_NAME), - } - q = client.create_queue(request={"parent": parent, "queue": queue}) - - yield q - - client.delete_queue(request={"name": q.name}) - - -def test_create_http_task(test_queue): - url = "https://example.com/task_handler" - result = create_http_task.create_http_task( - TEST_PROJECT_ID, TEST_QUEUE_NAME, TEST_LOCATION, url - ) - assert TEST_QUEUE_NAME in result.name - - result = create_http_task.create_http_task( - TEST_PROJECT_ID, - TEST_QUEUE_NAME, - TEST_LOCATION, - url, - payload="hello", - in_seconds=180, - task_name=uuid.uuid4().hex, - deadline=900, - ) - assert TEST_QUEUE_NAME in result.name diff --git a/samples/snippets/create_http_task_with_token.py b/samples/snippets/create_http_task_with_token.py deleted file mode 100644 index 0e157eb9..00000000 --- a/samples/snippets/create_http_task_with_token.py +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2019 Google LLC All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from __future__ import print_function - - -def create_http_task( - project, - queue, - location, - url, - service_account_email, - audience=None, - payload=None, -): - # [START cloud_tasks_create_http_task_with_token] - """Create a task for a given queue with an arbitrary payload.""" - - from google.cloud import tasks_v2 - - # Create a client. - client = tasks_v2.CloudTasksClient() - - # TODO(developer): Uncomment these lines and replace with your values. - # project = 'my-project-id' - # queue = 'my-queue' - # location = 'us-central1' - # url = 'https://example.com/task_handler?param=value' - # audience = 'https://example.com/task_handler' - # service_account_email = 'service-account@my-project-id.iam.gserviceaccount.com'; - # payload = 'hello' - - # Construct the fully qualified queue name. - parent = client.queue_path(project, location, queue) - - # Construct the request body. - task = { - "http_request": { # Specify the type of request. - "http_method": tasks_v2.HttpMethod.POST, - "url": url, # The full url path that the task will be sent to. - "oidc_token": { - "service_account_email": service_account_email, - "audience": audience, - }, - } - } - - if payload is not None: - # The API expects a payload of type bytes. - converted_payload = payload.encode() - - # Add the payload to the request. - task["http_request"]["body"] = converted_payload - - # Use the client to build and send the task. - response = client.create_task(request={"parent": parent, "task": task}) - - print("Created task {}".format(response.name)) - return response - - -# [END cloud_tasks_create_http_task_with_token] diff --git a/samples/snippets/create_http_task_with_token_test.py b/samples/snippets/create_http_task_with_token_test.py deleted file mode 100644 index b93c3437..00000000 --- a/samples/snippets/create_http_task_with_token_test.py +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2019 Google LLC All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import uuid - -from google.cloud import tasks_v2 -import pytest - -import create_http_task_with_token - -TEST_PROJECT_ID = os.getenv("GOOGLE_CLOUD_PROJECT") -TEST_LOCATION = os.getenv("TEST_QUEUE_LOCATION", "us-central1") -TEST_QUEUE_NAME = f"my-queue-{uuid.uuid4().hex}" -TEST_SERVICE_ACCOUNT = ( - "test-run-invoker@python-docs-samples-tests.iam.gserviceaccount.com" -) - - -@pytest.fixture() -def test_queue(): - client = tasks_v2.CloudTasksClient() - parent = f"projects/{TEST_PROJECT_ID}/locations/{TEST_LOCATION}" - queue = { - # The fully qualified path to the queue - "name": client.queue_path(TEST_PROJECT_ID, TEST_LOCATION, TEST_QUEUE_NAME), - } - q = client.create_queue(request={"parent": parent, "queue": queue}) - - yield q - - client.delete_queue(request={"name": q.name}) - - -def test_create_http_task_with_token(test_queue): - url = "https://example.com/task_handler" - result = create_http_task_with_token.create_http_task( - TEST_PROJECT_ID, TEST_QUEUE_NAME, TEST_LOCATION, url, TEST_SERVICE_ACCOUNT - ) - assert TEST_QUEUE_NAME in result.name diff --git a/samples/snippets/create_queue.py b/samples/snippets/create_queue.py deleted file mode 100644 index 2192daff..00000000 --- a/samples/snippets/create_queue.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# [START cloud_tasks_create_queue] -def create_queue(project, queue_name, location): - """Create a task queue.""" - - from google.cloud import tasks_v2 - - # Create a client. - client = tasks_v2.CloudTasksClient() - - # Construct the fully qualified location path. - parent = f"projects/{project}/locations/{location}" - - # Construct the create queue request. - queue = {"name": client.queue_path(project, location, queue_name)} - - # Use the client to create the queue. - response = client.create_queue(request={"parent": parent, "queue": queue}) - - print("Created queue {}".format(response.name)) - return response - - -# [END cloud_tasks_create_queue] diff --git a/samples/snippets/create_queue_test.py b/samples/snippets/create_queue_test.py deleted file mode 100644 index 64ee0597..00000000 --- a/samples/snippets/create_queue_test.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import uuid - -from google.cloud import tasks_v2 -import pytest - -import create_queue - -TEST_PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"] -TEST_LOCATION = os.getenv("TEST_QUEUE_LOCATION", "us-central1") -TEST_QUEUE_NAME = f"my-queue-{uuid.uuid4().hex}" - - -@pytest.fixture() -def test_queue(): - client = tasks_v2.CloudTasksClient() - q = create_queue.create_queue(TEST_PROJECT_ID, TEST_QUEUE_NAME, TEST_LOCATION) - - yield q - - client.delete_queue(request={"name": q.name}) - - -def test_create_queue(capsys, test_queue): - out, _ = capsys.readouterr() - assert "Created queue" in out diff --git a/samples/snippets/delete_queue.py b/samples/snippets/delete_queue.py deleted file mode 100644 index 0c76a962..00000000 --- a/samples/snippets/delete_queue.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# [START cloud_tasks_delete_queue] -def delete_queue(project, queue_name, location): - """Delete a task queue.""" - - from google.cloud import tasks_v2 - - # Create a client. - client = tasks_v2.CloudTasksClient() - - # Get the fully qualified path to queue. - queue = client.queue_path(project, location, queue_name) - - # Use the client to delete the queue. - client.delete_queue(request={"name": queue}) - print("Deleted queue") - - -# [END cloud_tasks_delete_queue] diff --git a/samples/snippets/delete_queue_test.py b/samples/snippets/delete_queue_test.py deleted file mode 100644 index 0d1914e8..00000000 --- a/samples/snippets/delete_queue_test.py +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import uuid - -from google.api_core import exceptions -from google.cloud import tasks_v2 -import pytest - -import delete_queue - -TEST_PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"] -TEST_LOCATION = os.getenv("TEST_QUEUE_LOCATION", "us-central1") -TEST_QUEUE_NAME = f"my-queue-{uuid.uuid4().hex}" - - -@pytest.fixture() -def test_queue(): - client = tasks_v2.CloudTasksClient() - parent = f"projects/{TEST_PROJECT_ID}/locations/{TEST_LOCATION}" - queue = { - # The fully qualified path to the queue - "name": client.queue_path(TEST_PROJECT_ID, TEST_LOCATION, TEST_QUEUE_NAME), - } - q = client.create_queue(request={"parent": parent, "queue": queue}) - - yield q - - try: - # Attempt to delete the queue in case the sample failed. - client.delete_queue(request={"name": q.name}) - except exceptions.NotFound: - # The queue was already successfully deleted. - print("Queue already deleted successfully") - - -def test_delete_queue(capsys, test_queue): - delete_queue.delete_queue(TEST_PROJECT_ID, TEST_QUEUE_NAME, TEST_LOCATION) - out, _ = capsys.readouterr() - assert "Deleted queue" in out diff --git a/samples/snippets/list_queues.py b/samples/snippets/list_queues.py deleted file mode 100644 index 17b7886c..00000000 --- a/samples/snippets/list_queues.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# [START cloud_tasks_list_queues] -def list_queues(project, location): - """List all task queues.""" - - from google.cloud import tasks_v2 - - # Create a client. - client = tasks_v2.CloudTasksClient() - - # Construct the fully qualified location path. - parent = f"projects/{project}/locations/{location}" - - # Use the client to obtain the queues. - response = client.list_queues(request={"parent": parent}) - - # Print the results. - num_results = 0 - for queue in response: - num_results = num_results + 1 - print(queue.name) - - if num_results == 0: - print("No queues found!") - - -# [END cloud_tasks_list_queues] diff --git a/samples/snippets/list_queues_test.py b/samples/snippets/list_queues_test.py deleted file mode 100644 index 2f1d07d9..00000000 --- a/samples/snippets/list_queues_test.py +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import uuid - -from google.cloud import tasks_v2 -import pytest - -import list_queues - -TEST_PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"] -TEST_LOCATION = os.getenv("TEST_QUEUE_LOCATION", "us-central1") -TEST_QUEUE_NAME = f"my-queue-{uuid.uuid4().hex}" - - -@pytest.fixture() -def test_queue(): - client = tasks_v2.CloudTasksClient() - parent = f"projects/{TEST_PROJECT_ID}/locations/{TEST_LOCATION}" - queue = { - # The fully qualified path to the queue - "name": client.queue_path(TEST_PROJECT_ID, TEST_LOCATION, TEST_QUEUE_NAME), - } - q = client.create_queue(request={"parent": parent, "queue": queue}) - - yield q - - client.delete_queue(request={"name": q.name}) - - -def test_list_queues_not_present(capsys): - list_queues.list_queues(TEST_PROJECT_ID, TEST_LOCATION) - out, _ = capsys.readouterr() - - assert TEST_QUEUE_NAME not in out - - -def test_list_queues_present(capsys, test_queue): - list_queues.list_queues(TEST_PROJECT_ID, TEST_LOCATION) - out, _ = capsys.readouterr() - - assert TEST_QUEUE_NAME in out diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py deleted file mode 100644 index 05770846..00000000 --- a/samples/snippets/noxfile.py +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from __future__ import print_function - -import glob -import os -from pathlib import Path -import sys -from typing import Callable, Dict, Optional - -import nox - -# WARNING - WARNING - WARNING - WARNING - WARNING -# WARNING - WARNING - WARNING - WARNING - WARNING -# DO NOT EDIT THIS FILE EVER! -# WARNING - WARNING - WARNING - WARNING - WARNING -# WARNING - WARNING - WARNING - WARNING - WARNING - -BLACK_VERSION = "black==22.3.0" -ISORT_VERSION = "isort==5.10.1" - -# Copy `noxfile_config.py` to your directory and modify it instead. - -# `TEST_CONFIG` dict is a configuration hook that allows users to -# modify the test configurations. The values here should be in sync -# with `noxfile_config.py`. Users will copy `noxfile_config.py` into -# their directory and modify it. - -TEST_CONFIG = { - # You can opt out from the test for specific Python versions. - "ignored_versions": [], - # Old samples are opted out of enforcing Python type hints - # All new samples should feature them - "enforce_type_hints": False, - # An envvar key for determining the project id to use. Change it - # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a - # build specific Cloud project. You can also use your own string - # to use your own Cloud project. - "gcloud_project_env": "GOOGLE_CLOUD_PROJECT", - # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT', - # If you need to use a specific version of pip, - # change pip_version_override to the string representation - # of the version number, for example, "20.2.4" - "pip_version_override": None, - # A dictionary you want to inject into your test. Don't put any - # secrets here. These values will override predefined values. - "envs": {}, -} - - -try: - # Ensure we can import noxfile_config in the project's directory. - sys.path.append(".") - from noxfile_config import TEST_CONFIG_OVERRIDE -except ImportError as e: - print("No user noxfile_config found: detail: {}".format(e)) - TEST_CONFIG_OVERRIDE = {} - -# Update the TEST_CONFIG with the user supplied values. -TEST_CONFIG.update(TEST_CONFIG_OVERRIDE) - - -def get_pytest_env_vars() -> Dict[str, str]: - """Returns a dict for pytest invocation.""" - ret = {} - - # Override the GCLOUD_PROJECT and the alias. - env_key = TEST_CONFIG["gcloud_project_env"] - # This should error out if not set. - ret["GOOGLE_CLOUD_PROJECT"] = os.environ[env_key] - - # Apply user supplied envs. - ret.update(TEST_CONFIG["envs"]) - return ret - - -# DO NOT EDIT - automatically generated. -# All versions used to test samples. -ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10"] - -# Any default versions that should be ignored. -IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"] - -TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS]) - -INSTALL_LIBRARY_FROM_SOURCE = os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False) in ( - "True", - "true", -) - -# Error if a python version is missing -nox.options.error_on_missing_interpreters = True - -# -# Style Checks -# - - -# Linting with flake8. -# -# We ignore the following rules: -# E203: whitespace before ‘:’ -# E266: too many leading ‘#’ for block comment -# E501: line too long -# I202: Additional newline in a section of imports -# -# We also need to specify the rules which are ignored by default: -# ['E226', 'W504', 'E126', 'E123', 'W503', 'E24', 'E704', 'E121'] -FLAKE8_COMMON_ARGS = [ - "--show-source", - "--builtin=gettext", - "--max-complexity=20", - "--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py", - "--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202", - "--max-line-length=88", -] - - -@nox.session -def lint(session: nox.sessions.Session) -> None: - if not TEST_CONFIG["enforce_type_hints"]: - session.install("flake8") - else: - session.install("flake8", "flake8-annotations") - - args = FLAKE8_COMMON_ARGS + [ - ".", - ] - session.run("flake8", *args) - - -# -# Black -# - - -@nox.session -def blacken(session: nox.sessions.Session) -> None: - """Run black. Format code to uniform standard.""" - session.install(BLACK_VERSION) - python_files = [path for path in os.listdir(".") if path.endswith(".py")] - - session.run("black", *python_files) - - -# -# format = isort + black -# - - -@nox.session -def format(session: nox.sessions.Session) -> None: - """ - Run isort to sort imports. Then run black - to format code to uniform standard. - """ - session.install(BLACK_VERSION, ISORT_VERSION) - python_files = [path for path in os.listdir(".") if path.endswith(".py")] - - # Use the --fss option to sort imports using strict alphabetical order. - # See https://pycqa.github.io/isort/docs/configuration/options.html#force-sort-within-sections - session.run("isort", "--fss", *python_files) - session.run("black", *python_files) - - -# -# Sample Tests -# - - -PYTEST_COMMON_ARGS = ["--junitxml=sponge_log.xml"] - - -def _session_tests( - session: nox.sessions.Session, post_install: Callable = None -) -> None: - # check for presence of tests - test_list = glob.glob("**/*_test.py", recursive=True) + glob.glob( - "**/test_*.py", recursive=True - ) - test_list.extend(glob.glob("**/tests", recursive=True)) - - if len(test_list) == 0: - print("No tests found, skipping directory.") - return - - if TEST_CONFIG["pip_version_override"]: - pip_version = TEST_CONFIG["pip_version_override"] - session.install(f"pip=={pip_version}") - """Runs py.test for a particular project.""" - concurrent_args = [] - if os.path.exists("requirements.txt"): - if os.path.exists("constraints.txt"): - session.install("-r", "requirements.txt", "-c", "constraints.txt") - else: - session.install("-r", "requirements.txt") - with open("requirements.txt") as rfile: - packages = rfile.read() - - if os.path.exists("requirements-test.txt"): - if os.path.exists("constraints-test.txt"): - session.install("-r", "requirements-test.txt", "-c", "constraints-test.txt") - else: - session.install("-r", "requirements-test.txt") - with open("requirements-test.txt") as rtfile: - packages += rtfile.read() - - if INSTALL_LIBRARY_FROM_SOURCE: - session.install("-e", _get_repo_root()) - - if post_install: - post_install(session) - - if "pytest-parallel" in packages: - concurrent_args.extend(["--workers", "auto", "--tests-per-worker", "auto"]) - elif "pytest-xdist" in packages: - concurrent_args.extend(["-n", "auto"]) - - session.run( - "pytest", - *(PYTEST_COMMON_ARGS + session.posargs + concurrent_args), - # Pytest will return 5 when no tests are collected. This can happen - # on travis where slow and flaky tests are excluded. - # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html - success_codes=[0, 5], - env=get_pytest_env_vars(), - ) - - -@nox.session(python=ALL_VERSIONS) -def py(session: nox.sessions.Session) -> None: - """Runs py.test for a sample using the specified version of Python.""" - if session.python in TESTED_VERSIONS: - _session_tests(session) - else: - session.skip( - "SKIPPED: {} tests are disabled for this sample.".format(session.python) - ) - - -# -# Readmegen -# - - -def _get_repo_root() -> Optional[str]: - """Returns the root folder of the project.""" - # Get root of this repository. Assume we don't have directories nested deeper than 10 items. - p = Path(os.getcwd()) - for i in range(10): - if p is None: - break - if Path(p / ".git").exists(): - return str(p) - # .git is not available in repos cloned via Cloud Build - # setup.py is always in the library's root, so use that instead - # https://github.com/googleapis/synthtool/issues/792 - if Path(p / "setup.py").exists(): - return str(p) - p = p.parent - raise Exception("Unable to detect repository root.") - - -GENERATED_READMES = sorted([x for x in Path(".").rglob("*.rst.in")]) - - -@nox.session -@nox.parametrize("path", GENERATED_READMES) -def readmegen(session: nox.sessions.Session, path: str) -> None: - """(Re-)generates the readme for a sample.""" - session.install("jinja2", "pyyaml") - dir_ = os.path.dirname(path) - - if os.path.exists(os.path.join(dir_, "requirements.txt")): - session.install("-r", os.path.join(dir_, "requirements.txt")) - - in_file = os.path.join(dir_, "README.rst.in") - session.run( - "python", _get_repo_root() + "/scripts/readme-gen/readme_gen.py", in_file - ) diff --git a/samples/snippets/requirements-test.txt b/samples/snippets/requirements-test.txt deleted file mode 100644 index 49780e03..00000000 --- a/samples/snippets/requirements-test.txt +++ /dev/null @@ -1 +0,0 @@ -pytest==7.2.0 diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt deleted file mode 100644 index 1bbf5163..00000000 --- a/samples/snippets/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -google-cloud-tasks==2.10.4 From 712b500e3ffd7891809791cde65209cc81fcf993 Mon Sep 17 00:00:00 2001 From: Sampath Kumar Date: Thu, 8 Dec 2022 00:52:23 +0100 Subject: [PATCH 08/11] chrore: update readme.md page (#322) --- samples/{ => snippets}/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename samples/{ => snippets}/README.md (100%) diff --git a/samples/README.md b/samples/snippets/README.md similarity index 100% rename from samples/README.md rename to samples/snippets/README.md From 5752acb09be8771f6695de4928444c47849fafc4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 13:29:59 -0500 Subject: [PATCH 09/11] fix(deps): Require google-api-core >=1.34.0, >=2.11.0 (#320) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(deps): Require google-api-core >=1.34.0, >=2.11.0 fix: Drop usage of pkg_resources fix: Fix timeout default values docs(samples): Snippetgen should call await on the operation coroutine before calling result PiperOrigin-RevId: 493260409 Source-Link: https://github.com/googleapis/googleapis/commit/fea43879f83a8d0dacc9353b3f75f8f46d37162f Source-Link: https://github.com/googleapis/googleapis-gen/commit/387b7344c7529ee44be84e613b19a820508c612b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzg3YjczNDRjNzUyOWVlNDRiZTg0ZTYxM2IxOWE4MjA1MDhjNjEyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * add gapic_version.py Co-authored-by: Owl Bot Co-authored-by: Anthonios Partheniou --- .coveragerc | 5 -- google/cloud/tasks_v2/gapic_version.py | 16 ++++++ .../services/cloud_tasks/async_client.py | 46 ++++++++-------- .../tasks_v2/services/cloud_tasks/client.py | 46 ++++++++-------- .../services/cloud_tasks/transports/base.py | 13 ++--- google/cloud/tasks_v2beta2/gapic_version.py | 16 ++++++ .../services/cloud_tasks/async_client.py | 54 +++++++++---------- .../services/cloud_tasks/client.py | 54 +++++++++---------- .../services/cloud_tasks/transports/base.py | 13 ++--- google/cloud/tasks_v2beta3/gapic_version.py | 16 ++++++ .../services/cloud_tasks/async_client.py | 46 ++++++++-------- .../services/cloud_tasks/client.py | 46 ++++++++-------- .../services/cloud_tasks/transports/base.py | 13 ++--- release-please-config.json | 3 ++ setup.py | 2 +- testing/constraints-3.7.txt | 2 +- 16 files changed, 199 insertions(+), 192 deletions(-) create mode 100644 google/cloud/tasks_v2/gapic_version.py create mode 100644 google/cloud/tasks_v2beta2/gapic_version.py create mode 100644 google/cloud/tasks_v2beta3/gapic_version.py diff --git a/.coveragerc b/.coveragerc index 1d5bc53f..b11c90d0 100644 --- a/.coveragerc +++ b/.coveragerc @@ -10,8 +10,3 @@ exclude_lines = pragma: NO COVER # Ignore debug-only repr def __repr__ - # Ignore pkg_resources exceptions. - # This is added at the module level as a safeguard for if someone - # generates the code and tries to run it without pip installing. This - # makes it virtually impossible to test properly. - except pkg_resources.DistributionNotFound diff --git a/google/cloud/tasks_v2/gapic_version.py b/google/cloud/tasks_v2/gapic_version.py new file mode 100644 index 00000000..fd2ac0e5 --- /dev/null +++ b/google/cloud/tasks_v2/gapic_version.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +__version__ = "2.10.4" # {x-release-please-version} diff --git a/google/cloud/tasks_v2/services/cloud_tasks/async_client.py b/google/cloud/tasks_v2/services/cloud_tasks/async_client.py index 0041a087..c0371186 100644 --- a/google/cloud/tasks_v2/services/cloud_tasks/async_client.py +++ b/google/cloud/tasks_v2/services/cloud_tasks/async_client.py @@ -34,7 +34,8 @@ from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources + +from google.cloud.tasks_v2 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -228,7 +229,7 @@ async def list_queues( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesAsyncPager: r"""Lists queues. @@ -354,7 +355,7 @@ async def get_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -471,7 +472,7 @@ async def create_queue( parent: Optional[str] = None, queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -604,7 +605,7 @@ async def update_queue( queue: Optional[gct_queue.Queue] = None, update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -743,7 +744,7 @@ async def delete_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -854,7 +855,7 @@ async def purge_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -965,7 +966,7 @@ async def pause_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1078,7 +1079,7 @@ async def resume_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1198,7 +1199,7 @@ async def get_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1382,7 +1383,7 @@ async def set_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1561,7 +1562,7 @@ async def test_iam_permissions( resource: Optional[str] = None, permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1695,7 +1696,7 @@ async def list_tasks( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksAsyncPager: r"""Lists the tasks in a queue. @@ -1830,7 +1831,7 @@ async def get_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -1942,7 +1943,7 @@ async def create_task( parent: Optional[str] = None, task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2097,7 +2098,7 @@ async def delete_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2201,7 +2202,7 @@ async def run_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -2329,14 +2330,9 @@ async def __aexit__(self, exc_type, exc, tb): await self.transport.close() -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) __all__ = ("CloudTasksAsyncClient",) diff --git a/google/cloud/tasks_v2/services/cloud_tasks/client.py b/google/cloud/tasks_v2/services/cloud_tasks/client.py index 23a5c88b..1dde2b16 100644 --- a/google/cloud/tasks_v2/services/cloud_tasks/client.py +++ b/google/cloud/tasks_v2/services/cloud_tasks/client.py @@ -38,7 +38,8 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources + +from google.cloud.tasks_v2 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -481,7 +482,7 @@ def list_queues( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesPager: r"""Lists queues. @@ -597,7 +598,7 @@ def get_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -704,7 +705,7 @@ def create_queue( parent: Optional[str] = None, queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -837,7 +838,7 @@ def update_queue( queue: Optional[gct_queue.Queue] = None, update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -976,7 +977,7 @@ def delete_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -1077,7 +1078,7 @@ def purge_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -1188,7 +1189,7 @@ def pause_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1301,7 +1302,7 @@ def resume_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1421,7 +1422,7 @@ def get_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1592,7 +1593,7 @@ def set_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1768,7 +1769,7 @@ def test_iam_permissions( resource: Optional[str] = None, permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1890,7 +1891,7 @@ def list_tasks( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksPager: r"""Lists the tasks in a queue. @@ -2015,7 +2016,7 @@ def get_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -2117,7 +2118,7 @@ def create_task( parent: Optional[str] = None, task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2272,7 +2273,7 @@ def delete_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2366,7 +2367,7 @@ def run_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -2501,14 +2502,9 @@ def __exit__(self, type, value, traceback): self.transport.close() -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) __all__ = ("CloudTasksClient",) diff --git a/google/cloud/tasks_v2/services/cloud_tasks/transports/base.py b/google/cloud/tasks_v2/services/cloud_tasks/transports/base.py index eea2138f..76c99af0 100644 --- a/google/cloud/tasks_v2/services/cloud_tasks/transports/base.py +++ b/google/cloud/tasks_v2/services/cloud_tasks/transports/base.py @@ -26,22 +26,17 @@ from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore from google.protobuf import empty_pb2 # type: ignore -import pkg_resources +from google.cloud.tasks_v2 import gapic_version as package_version from google.cloud.tasks_v2.types import cloudtasks from google.cloud.tasks_v2.types import queue from google.cloud.tasks_v2.types import queue as gct_queue from google.cloud.tasks_v2.types import task from google.cloud.tasks_v2.types import task as gct_task -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) class CloudTasksTransport(abc.ABC): diff --git a/google/cloud/tasks_v2beta2/gapic_version.py b/google/cloud/tasks_v2beta2/gapic_version.py new file mode 100644 index 00000000..fd2ac0e5 --- /dev/null +++ b/google/cloud/tasks_v2beta2/gapic_version.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +__version__ = "2.10.4" # {x-release-please-version} diff --git a/google/cloud/tasks_v2beta2/services/cloud_tasks/async_client.py b/google/cloud/tasks_v2beta2/services/cloud_tasks/async_client.py index f7ee442c..e678f2d2 100644 --- a/google/cloud/tasks_v2beta2/services/cloud_tasks/async_client.py +++ b/google/cloud/tasks_v2beta2/services/cloud_tasks/async_client.py @@ -34,7 +34,8 @@ from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources + +from google.cloud.tasks_v2beta2 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -228,7 +229,7 @@ async def list_queues( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesAsyncPager: r"""Lists queues. @@ -354,7 +355,7 @@ async def get_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -471,7 +472,7 @@ async def create_queue( parent: Optional[str] = None, queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -604,7 +605,7 @@ async def update_queue( queue: Optional[gct_queue.Queue] = None, update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -744,7 +745,7 @@ async def delete_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -855,7 +856,7 @@ async def purge_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -966,7 +967,7 @@ async def pause_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1079,7 +1080,7 @@ async def resume_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1199,7 +1200,7 @@ async def get_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1383,7 +1384,7 @@ async def set_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1562,7 +1563,7 @@ async def test_iam_permissions( resource: Optional[str] = None, permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1696,7 +1697,7 @@ async def list_tasks( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksAsyncPager: r"""Lists the tasks in a queue. @@ -1831,7 +1832,7 @@ async def get_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -1943,7 +1944,7 @@ async def create_task( parent: Optional[str] = None, task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2102,7 +2103,7 @@ async def delete_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2207,7 +2208,7 @@ async def lease_tasks( parent: Optional[str] = None, lease_duration: Optional[duration_pb2.Duration] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> cloudtasks.LeaseTasksResponse: r"""Leases tasks from a pull queue for @@ -2366,7 +2367,7 @@ async def acknowledge_task( name: Optional[str] = None, schedule_time: Optional[timestamp_pb2.Timestamp] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Acknowledges a pull task. @@ -2489,7 +2490,7 @@ async def renew_lease( schedule_time: Optional[timestamp_pb2.Timestamp] = None, lease_duration: Optional[duration_pb2.Duration] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Renew the current lease of a pull task. @@ -2624,7 +2625,7 @@ async def cancel_lease( name: Optional[str] = None, schedule_time: Optional[timestamp_pb2.Timestamp] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Cancel a pull task's lease. @@ -2748,7 +2749,7 @@ async def run_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -2882,14 +2883,9 @@ async def __aexit__(self, exc_type, exc, tb): await self.transport.close() -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) __all__ = ("CloudTasksAsyncClient",) diff --git a/google/cloud/tasks_v2beta2/services/cloud_tasks/client.py b/google/cloud/tasks_v2beta2/services/cloud_tasks/client.py index 889e84ac..8468c217 100644 --- a/google/cloud/tasks_v2beta2/services/cloud_tasks/client.py +++ b/google/cloud/tasks_v2beta2/services/cloud_tasks/client.py @@ -38,7 +38,8 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources + +from google.cloud.tasks_v2beta2 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -481,7 +482,7 @@ def list_queues( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesPager: r"""Lists queues. @@ -597,7 +598,7 @@ def get_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -704,7 +705,7 @@ def create_queue( parent: Optional[str] = None, queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -837,7 +838,7 @@ def update_queue( queue: Optional[gct_queue.Queue] = None, update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -977,7 +978,7 @@ def delete_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -1078,7 +1079,7 @@ def purge_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -1189,7 +1190,7 @@ def pause_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1302,7 +1303,7 @@ def resume_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1422,7 +1423,7 @@ def get_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1593,7 +1594,7 @@ def set_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1769,7 +1770,7 @@ def test_iam_permissions( resource: Optional[str] = None, permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1891,7 +1892,7 @@ def list_tasks( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksPager: r"""Lists the tasks in a queue. @@ -2016,7 +2017,7 @@ def get_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -2118,7 +2119,7 @@ def create_task( parent: Optional[str] = None, task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2277,7 +2278,7 @@ def delete_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2372,7 +2373,7 @@ def lease_tasks( parent: Optional[str] = None, lease_duration: Optional[duration_pb2.Duration] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> cloudtasks.LeaseTasksResponse: r"""Leases tasks from a pull queue for @@ -2531,7 +2532,7 @@ def acknowledge_task( name: Optional[str] = None, schedule_time: Optional[timestamp_pb2.Timestamp] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Acknowledges a pull task. @@ -2654,7 +2655,7 @@ def renew_lease( schedule_time: Optional[timestamp_pb2.Timestamp] = None, lease_duration: Optional[duration_pb2.Duration] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Renew the current lease of a pull task. @@ -2789,7 +2790,7 @@ def cancel_lease( name: Optional[str] = None, schedule_time: Optional[timestamp_pb2.Timestamp] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Cancel a pull task's lease. @@ -2913,7 +2914,7 @@ def run_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -3054,14 +3055,9 @@ def __exit__(self, type, value, traceback): self.transport.close() -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) __all__ = ("CloudTasksClient",) diff --git a/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/base.py b/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/base.py index 09253b15..a2813481 100644 --- a/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/base.py +++ b/google/cloud/tasks_v2beta2/services/cloud_tasks/transports/base.py @@ -26,22 +26,17 @@ from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore from google.protobuf import empty_pb2 # type: ignore -import pkg_resources +from google.cloud.tasks_v2beta2 import gapic_version as package_version from google.cloud.tasks_v2beta2.types import cloudtasks from google.cloud.tasks_v2beta2.types import queue from google.cloud.tasks_v2beta2.types import queue as gct_queue from google.cloud.tasks_v2beta2.types import task from google.cloud.tasks_v2beta2.types import task as gct_task -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) class CloudTasksTransport(abc.ABC): diff --git a/google/cloud/tasks_v2beta3/gapic_version.py b/google/cloud/tasks_v2beta3/gapic_version.py new file mode 100644 index 00000000..fd2ac0e5 --- /dev/null +++ b/google/cloud/tasks_v2beta3/gapic_version.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +__version__ = "2.10.4" # {x-release-please-version} diff --git a/google/cloud/tasks_v2beta3/services/cloud_tasks/async_client.py b/google/cloud/tasks_v2beta3/services/cloud_tasks/async_client.py index 3c0b0375..d589cc6e 100644 --- a/google/cloud/tasks_v2beta3/services/cloud_tasks/async_client.py +++ b/google/cloud/tasks_v2beta3/services/cloud_tasks/async_client.py @@ -34,7 +34,8 @@ from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources + +from google.cloud.tasks_v2beta3 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -228,7 +229,7 @@ async def list_queues( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesAsyncPager: r"""Lists queues. @@ -354,7 +355,7 @@ async def get_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -471,7 +472,7 @@ async def create_queue( parent: Optional[str] = None, queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -604,7 +605,7 @@ async def update_queue( queue: Optional[gct_queue.Queue] = None, update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -744,7 +745,7 @@ async def delete_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -855,7 +856,7 @@ async def purge_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -966,7 +967,7 @@ async def pause_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1079,7 +1080,7 @@ async def resume_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1199,7 +1200,7 @@ async def get_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1383,7 +1384,7 @@ async def set_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1562,7 +1563,7 @@ async def test_iam_permissions( resource: Optional[str] = None, permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1696,7 +1697,7 @@ async def list_tasks( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksAsyncPager: r"""Lists the tasks in a queue. @@ -1831,7 +1832,7 @@ async def get_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -1943,7 +1944,7 @@ async def create_task( parent: Optional[str] = None, task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2098,7 +2099,7 @@ async def delete_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2202,7 +2203,7 @@ async def run_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -2331,14 +2332,9 @@ async def __aexit__(self, exc_type, exc, tb): await self.transport.close() -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) __all__ = ("CloudTasksAsyncClient",) diff --git a/google/cloud/tasks_v2beta3/services/cloud_tasks/client.py b/google/cloud/tasks_v2beta3/services/cloud_tasks/client.py index afba7619..31abb748 100644 --- a/google/cloud/tasks_v2beta3/services/cloud_tasks/client.py +++ b/google/cloud/tasks_v2beta3/services/cloud_tasks/client.py @@ -38,7 +38,8 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources + +from google.cloud.tasks_v2beta3 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -481,7 +482,7 @@ def list_queues( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListQueuesPager: r"""Lists queues. @@ -597,7 +598,7 @@ def get_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Gets a queue. @@ -704,7 +705,7 @@ def create_queue( parent: Optional[str] = None, queue: Optional[gct_queue.Queue] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Creates a queue. @@ -837,7 +838,7 @@ def update_queue( queue: Optional[gct_queue.Queue] = None, update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_queue.Queue: r"""Updates a queue. @@ -977,7 +978,7 @@ def delete_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a queue. @@ -1078,7 +1079,7 @@ def purge_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Purges a queue by deleting all of its tasks. @@ -1189,7 +1190,7 @@ def pause_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Pauses the queue. @@ -1302,7 +1303,7 @@ def resume_queue( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> queue.Queue: r"""Resume a queue. @@ -1422,7 +1423,7 @@ def get_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the access control policy for a @@ -1593,7 +1594,7 @@ def set_iam_policy( *, resource: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Sets the access control policy for a @@ -1769,7 +1770,7 @@ def test_iam_permissions( resource: Optional[str] = None, permissions: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: r"""Returns permissions that a caller has on a @@ -1891,7 +1892,7 @@ def list_tasks( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTasksPager: r"""Lists the tasks in a queue. @@ -2016,7 +2017,7 @@ def get_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Gets a task. @@ -2118,7 +2119,7 @@ def create_task( parent: Optional[str] = None, task: Optional[gct_task.Task] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> gct_task.Task: r"""Creates a task and adds it to a queue. @@ -2273,7 +2274,7 @@ def delete_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a task. @@ -2367,7 +2368,7 @@ def run_task( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> task.Task: r"""Forces a task to run now. @@ -2503,14 +2504,9 @@ def __exit__(self, type, value, traceback): self.transport.close() -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) __all__ = ("CloudTasksClient",) diff --git a/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/base.py b/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/base.py index ed0ea228..a32ad4e0 100644 --- a/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/base.py +++ b/google/cloud/tasks_v2beta3/services/cloud_tasks/transports/base.py @@ -26,22 +26,17 @@ from google.iam.v1 import policy_pb2 # type: ignore from google.oauth2 import service_account # type: ignore from google.protobuf import empty_pb2 # type: ignore -import pkg_resources +from google.cloud.tasks_v2beta3 import gapic_version as package_version from google.cloud.tasks_v2beta3.types import cloudtasks from google.cloud.tasks_v2beta3.types import queue from google.cloud.tasks_v2beta3.types import queue as gct_queue from google.cloud.tasks_v2beta3.types import task from google.cloud.tasks_v2beta3.types import task as gct_task -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-tasks", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) class CloudTasksTransport(abc.ABC): diff --git a/release-please-config.json b/release-please-config.json index d2b0548c..47860163 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -4,7 +4,10 @@ ".": { "release-type": "python", "extra-files": [ + "google/cloud/tasks_v2/gapic_version.py", "google/cloud/tasks/gapic_version.py", + "google/cloud/tasks_v2beta3/gapic_version.py", + "google/cloud/tasks_v2beta2/gapic_version.py", { "type": "json", "path": "samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json", diff --git a/setup.py b/setup.py index 85a42c1e..20e516a2 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 1.33.2, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", + "google-api-core[grpc] >= 1.34.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", "proto-plus >= 1.22.0, <2.0.0dev", "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", "grpc-google-iam-v1 >= 0.12.4, < 1.0.0dev", diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 883a87ae..2beecf99 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -4,7 +4,7 @@ # Pin the version to the lower bound. # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev", # Then this file should have google-cloud-foo==1.14.0 -google-api-core==1.33.2 +google-api-core==1.34.0 proto-plus==1.22.0 protobuf==3.19.5 grpc-google-iam-v1==0.12.4 From be18891348c19e20c6a17b05410388cd295a2209 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 14:21:43 -0500 Subject: [PATCH 10/11] build(deps): bump certifi from 2022.9.24 to 2022.12.7 in /synthtool/gcp/templates/python_library/.kokoro (#324) Source-Link: https://github.com/googleapis/synthtool/commit/b4fe62efb5114b6738ad4b13d6f654f2bf4b7cc0 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:3bf87e47c2173d7eed42714589dc4da2c07c3268610f1e47f8e1a30decbfc7f1 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/requirements.txt | 6 +++--- .pre-commit-config.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index bb21147e..fccaa8e8 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:3abfa0f1886adaf0b83f07cb117b24a639ea1cb9cffe56d43280b977033563eb + digest: sha256:3bf87e47c2173d7eed42714589dc4da2c07c3268610f1e47f8e1a30decbfc7f1 diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 9c1b9be3..05dc4672 100644 --- 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.9.24 \ - --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \ - --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 +certifi==2022.12.7 \ + --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ + --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 46d23716..5405cc8f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: rev: 22.3.0 hooks: - id: black -- repo: https://gitlab.com/pycqa/flake8 +- repo: https://github.com/pycqa/flake8 rev: 3.9.2 hooks: - id: flake8 From b903f3192bbf47ff59ece1c3233ea81f67e7fa1c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 14:45:59 -0500 Subject: [PATCH 11/11] chore(main): release 2.11.0 (#319) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 22 +++++++++++++++++++ google/cloud/tasks/gapic_version.py | 2 +- google/cloud/tasks_v2/gapic_version.py | 2 +- google/cloud/tasks_v2beta2/gapic_version.py | 2 +- google/cloud/tasks_v2beta3/gapic_version.py | 2 +- ...nippet_metadata_google.cloud.tasks.v2.json | 2 +- ...t_metadata_google.cloud.tasks.v2beta2.json | 2 +- ...t_metadata_google.cloud.tasks.v2beta3.json | 2 +- 9 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index a68dab8f..a9b8e02a 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.10.4" + ".": "2.11.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 39f77625..b5aba4f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,28 @@ [1]: https://pypi.org/project/google-cloud-tasks/#history +## [2.11.0](https://github.com/googleapis/python-tasks/compare/v2.10.4...v2.11.0) (2022-12-15) + + +### Features + +* Add support for `google.cloud.tasks.__version__` ([d51539f](https://github.com/googleapis/python-tasks/commit/d51539fc4e6b7b5a3f6f34d014752f3a8989b016)) +* Add typing to proto.Message based class attributes ([d51539f](https://github.com/googleapis/python-tasks/commit/d51539fc4e6b7b5a3f6f34d014752f3a8989b016)) + + +### Bug Fixes + +* Add dict typing for client_options ([d51539f](https://github.com/googleapis/python-tasks/commit/d51539fc4e6b7b5a3f6f34d014752f3a8989b016)) +* **deps:** Require google-api-core >=1.34.0, >=2.11.0 ([5752acb](https://github.com/googleapis/python-tasks/commit/5752acb09be8771f6695de4928444c47849fafc4)) +* Drop usage of pkg_resources ([5752acb](https://github.com/googleapis/python-tasks/commit/5752acb09be8771f6695de4928444c47849fafc4)) +* Fix timeout default values ([5752acb](https://github.com/googleapis/python-tasks/commit/5752acb09be8771f6695de4928444c47849fafc4)) + + +### Documentation + +* **samples:** Snippetgen handling of repeated enum field ([d51539f](https://github.com/googleapis/python-tasks/commit/d51539fc4e6b7b5a3f6f34d014752f3a8989b016)) +* **samples:** Snippetgen should call await on the operation coroutine before calling result ([5752acb](https://github.com/googleapis/python-tasks/commit/5752acb09be8771f6695de4928444c47849fafc4)) + ## [2.10.4](https://github.com/googleapis/python-tasks/compare/v2.10.3...v2.10.4) (2022-10-07) diff --git a/google/cloud/tasks/gapic_version.py b/google/cloud/tasks/gapic_version.py index fd2ac0e5..bb74f811 100644 --- a/google/cloud/tasks/gapic_version.py +++ b/google/cloud/tasks/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.10.4" # {x-release-please-version} +__version__ = "2.11.0" # {x-release-please-version} diff --git a/google/cloud/tasks_v2/gapic_version.py b/google/cloud/tasks_v2/gapic_version.py index fd2ac0e5..bb74f811 100644 --- a/google/cloud/tasks_v2/gapic_version.py +++ b/google/cloud/tasks_v2/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.10.4" # {x-release-please-version} +__version__ = "2.11.0" # {x-release-please-version} diff --git a/google/cloud/tasks_v2beta2/gapic_version.py b/google/cloud/tasks_v2beta2/gapic_version.py index fd2ac0e5..bb74f811 100644 --- a/google/cloud/tasks_v2beta2/gapic_version.py +++ b/google/cloud/tasks_v2beta2/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.10.4" # {x-release-please-version} +__version__ = "2.11.0" # {x-release-please-version} diff --git a/google/cloud/tasks_v2beta3/gapic_version.py b/google/cloud/tasks_v2beta3/gapic_version.py index fd2ac0e5..bb74f811 100644 --- a/google/cloud/tasks_v2beta3/gapic_version.py +++ b/google/cloud/tasks_v2beta3/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.10.4" # {x-release-please-version} +__version__ = "2.11.0" # {x-release-please-version} diff --git a/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2.json b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2.json index 164c51d1..85d9f84e 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-tasks", - "version": "0.1.0" + "version": "2.11.0" }, "snippets": [ { diff --git a/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json index 006a84eb..c9e48479 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta2.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-tasks", - "version": "0.1.0" + "version": "2.11.0" }, "snippets": [ { diff --git a/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta3.json b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta3.json index 788516ef..a8032c2f 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta3.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.tasks.v2beta3.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-tasks", - "version": "0.1.0" + "version": "2.11.0" }, "snippets": [ {