Skip to content

Commit 503875c

Browse files
partheaparthea
authored
chore(librarian): update post processing files (#14683)
This PR includes post processing changes to support the latest version of the generated code https://github.com/googleapis/gapic-generator-python/releases/tag/v1.28.0
1 parent b870c87 commit 503875c

6 files changed

+31
-63
lines changed

‎.librarian/generator-input/client-post-processing/add-dependency-google-cloud-common.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,24 @@ replacements:
2323
# Exclude incompatible versions of `google-auth`
2424
# See https://github.com/googleapis/google-cloud-python/issues/12364
2525
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
26-
"proto-plus >= 1.22.3, <2.0.0",
26+
"grpcio >= 1.33.2, < 2.0.0",
2727
after: |
2828
dependencies = [
2929
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
3333
"google-cloud-common >= 1.0.0, <2.0.0",
34-
"proto-plus >= 1.22.3, <2.0.0",
34+
"grpcio >= 1.33.2, < 2.0.0",
3535
count: 1
3636
- paths: [
3737
packages/google-cloud-filestore/testing/constraints-3.7.txt
3838
]
3939
before: |
4040
google-api-core==1.34.1
4141
google-auth==2.14.1
42-
proto-plus==1.22.3
4342
after: |
4443
google-api-core==1.34.1
45-
google-auth==2.14.1
4644
google-cloud-common==1.0.0
47-
proto-plus==1.22.3
45+
google-auth==2.14.1
4846
count: 1

‎.librarian/generator-input/client-post-processing/add-missing-dependencies-to-setup-py-constraints.yaml‎

Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,26 @@ replacements:
2323
# Exclude incompatible versions of `google-auth`
2424
# See https://github.com/googleapis/google-cloud-python/issues/12364
2525
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
26-
"proto-plus >= 1.22.3, <2.0.0",
26+
"grpcio >= 1.33.2, < 2.0.0",
2727
after: |
2828
dependencies = [
2929
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
3333
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
34-
"proto-plus >= 1.22.3, <2.0.0",
34+
"grpcio >= 1.33.2, < 2.0.0",
3535
count: 1
3636
- paths: [
3737
packages/google-cloud-gke-hub/testing/constraints-3.7.txt
3838
]
3939
before: |
4040
google-api-core==1.34.1
4141
google-auth==2.14.1
42-
proto-plus==1.22.3
4342
after: |
4443
google-api-core==1.34.1
45-
google-auth==2.14.1
4644
grpc-google-iam-v1==0.12.4
47-
proto-plus==1.22.3
45+
google-auth==2.14.1
4846
count: 1
4947
- paths: [
5048
packages/google-cloud-build/setup.py
@@ -55,28 +53,26 @@ replacements:
5553
# Exclude incompatible versions of `google-auth`
5654
# See https://github.com/googleapis/google-cloud-python/issues/12364
5755
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
58-
"proto-plus >= 1.22.3, <2.0.0",
56+
"grpcio >= 1.33.2, < 2.0.0",
5957
after: |
6058
dependencies = [
6159
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
6260
# Exclude incompatible versions of `google-auth`
6361
# See https://github.com/googleapis/google-cloud-python/issues/12364
6462
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
6563
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
66-
"proto-plus >= 1.22.3, <2.0.0",
64+
"grpcio >= 1.33.2, < 2.0.0",
6765
count: 1
6866
- paths: [
6967
packages/google-cloud-build/testing/constraints-3.7.txt
7068
]
7169
before: |
7270
google-api-core==1.34.1
7371
google-auth==2.14.1
74-
proto-plus==1.22.3
7572
after: |
7673
google-api-core==1.34.1
77-
google-auth==2.14.1
7874
grpc-google-iam-v1==0.12.4
79-
proto-plus==1.22.3
75+
google-auth==2.14.1
8076
count: 1
8177
- paths: [
8278
packages/google-cloud-binary-authorization/setup.py
@@ -87,41 +83,37 @@ replacements:
8783
# Exclude incompatible versions of `google-auth`
8884
# See https://github.com/googleapis/google-cloud-python/issues/12364
8985
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
90-
"proto-plus >= 1.22.3, <2.0.0",
86+
"grpcio >= 1.33.2, < 2.0.0",
9187
after: |
9288
dependencies = [
9389
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
9490
# Exclude incompatible versions of `google-auth`
9591
# See https://github.com/googleapis/google-cloud-python/issues/12364
9692
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
9793
"grafeas >= 1.1.2, <2.0",
98-
"proto-plus >= 1.22.3, <2.0.0",
94+
"grpcio >= 1.33.2, < 2.0.0",
9995
count: 1
10096
- paths: [
10197
packages/google-cloud-binary-authorization/testing/constraints-3.7.txt
10298
]
10399
before: |
104100
google-api-core==1.34.1
105101
google-auth==2.14.1
106-
proto-plus==1.22.3
107102
after: |
108103
google-api-core==1.34.1
109-
google-auth==2.14.1
110104
grafeas==1.1.2
111-
proto-plus==1.22.3
105+
google-auth==2.14.1
112106
count: 1
113107
- paths: [
114108
packages/google-cloud-iam/testing/constraints-3.7.txt
115109
]
116110
before: |
117111
google-api-core==1.34.1
118112
google-auth==2.14.1
119-
proto-plus==1.22.3
120113
after: |
121114
google-api-core==1.34.1
122-
google-auth==2.14.1
123115
grpc-google-iam-v1==0.12.4
124-
proto-plus==1.22.3
116+
google-auth==2.14.1
125117
count: 1
126118
- paths: [
127119
packages/google-cloud-iam/setup.py
@@ -132,15 +124,15 @@ replacements:
132124
# Exclude incompatible versions of `google-auth`
133125
# See https://github.com/googleapis/google-cloud-python/issues/12364
134126
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
135-
"proto-plus >= 1.22.3, <2.0.0",
127+
"grpcio >= 1.33.2, < 2.0.0",
136128
after: |
137129
dependencies = [
138130
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
139131
# Exclude incompatible versions of `google-auth`
140132
# See https://github.com/googleapis/google-cloud-python/issues/12364
141133
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
142134
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
143-
"proto-plus >= 1.22.3, <2.0.0",
135+
"grpcio >= 1.33.2, < 2.0.0",
144136
count: 1
145137
- paths: [
146138
packages/google-cloud-policysimulator/setup.py
@@ -151,15 +143,15 @@ replacements:
151143
# Exclude incompatible versions of `google-auth`
152144
# See https://github.com/googleapis/google-cloud-python/issues/12364
153145
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
154-
"proto-plus >= 1.22.3, <2.0.0",
146+
"grpcio >= 1.33.2, < 2.0.0",
155147
after: |
156148
dependencies = [
157149
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
158150
# Exclude incompatible versions of `google-auth`
159151
# See https://github.com/googleapis/google-cloud-python/issues/12364
160152
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
161153
"google-cloud-org-policy >= 1.0.0, <2.0.0",
162-
"proto-plus >= 1.22.3, <2.0.0",
154+
"grpcio >= 1.33.2, < 2.0.0",
163155
count: 1
164156
- paths: [
165157
packages/google-shopping-merchant-notifications/setup.py
@@ -170,34 +162,24 @@ replacements:
170162
# Exclude incompatible versions of `google-auth`
171163
# See https://github.com/googleapis/google-cloud-python/issues/12364
172164
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
173-
"proto-plus >= 1.22.3, <2.0.0",
174-
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
175-
"protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
176-
\]
165+
"grpcio >= 1.33.2, < 2.0.0",
177166
after: |
178167
dependencies = [
179168
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
180169
# Exclude incompatible versions of `google-auth`
181170
# See https://github.com/googleapis/google-cloud-python/issues/12364
182171
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
183-
"proto-plus >= 1.22.3, <2.0.0",
184-
"proto-plus >= 1.25.0, <2.0.0; python_version >= '3.13'",
185-
"protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
186172
"google-shopping-type >= 1.0.0, <2.0.0",
187-
]
173+
"grpcio >= 1.33.2, < 2.0.0",
188174
count: 1
189175
- paths: [
190176
packages/google-shopping-merchant-notifications/testing/constraints-3.7.txt
191177
]
192178
before: |
193179
google-api-core==1.34.1
194180
google-auth==2.14.1
195-
proto-plus==1.22.3
196-
protobuf==3.20.2
197181
after: |
198182
google-api-core==1.34.1
199-
google-auth==2.14.1
200-
proto-plus==1.22.3
201183
google-shopping-type==1.0.0
202-
protobuf==3.20.2
184+
google-auth==2.14.1
203185
count: 1

‎.librarian/generator-input/client-post-processing/bigquery-storage-integration.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -439,17 +439,13 @@ replacements:
439439
before: |
440440
google-api-core==1.34.1
441441
google-auth==2.14.1
442-
proto-plus==1.22.3
443-
protobuf==3.20.2
444442
after: |
445443
google-api-core==1.34.1
446-
google-auth==2.14.1
447-
proto-plus==1.22.3
448444
libcst==0.2.5
449445
fastavro==0.21.2
450446
pandas==1.0.5
451447
pyarrow==0.15.0
452-
protobuf==3.20.2
448+
google-auth==2.14.1
453449
count: 1
454450
- paths: [
455451
packages/google-cloud-bigquery-storage/docs/index.rst,

‎.librarian/generator-input/client-post-processing/containeranalysis-grafeas-integration.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,26 @@ replacements:
2323
# Exclude incompatible versions of `google-auth`
2424
# See https://github.com/googleapis/google-cloud-python/issues/12364
2525
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
26-
"proto-plus >= 1.22.3, <2.0.0",
26+
"grpcio >= 1.33.2, < 2.0.0",
2727
after: |
2828
dependencies = [
2929
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
3333
"grafeas >=1.4.1, <2.0",
34-
"proto-plus >= 1.22.3, <2.0.0",
34+
"grpcio >= 1.33.2, < 2.0.0",
3535
count: 1
3636
- paths: [
3737
packages/google-cloud-containeranalysis/testing/constraints-3.7.txt
3838
]
3939
before: |
4040
google-api-core==1.34.1
4141
google-auth==2.14.1
42-
proto-plus==1.22.3
4342
after: |
4443
google-api-core==1.34.1
45-
google-auth==2.14.1
4644
grafeas==1.4.1
47-
proto-plus==1.22.3
45+
google-auth==2.14.1
4846
count: 1
4947
- paths: [
5048
packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py,

‎.librarian/generator-input/client-post-processing/integrate-isolated-handwritten-code.yaml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ replacements:
6464
# Exclude incompatible versions of `google-auth`
6565
# See https://github.com/googleapis/google-cloud-python/issues/12364
6666
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
67-
"proto-plus >= 1.22.3, <2.0.0",
67+
"grpcio >= 1.33.2, < 2.0.0",
6868
after: |
6969
dependencies = [
7070
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
7171
# Exclude incompatible versions of `google-auth`
7272
# See https://github.com/googleapis/google-cloud-python/issues/12364
7373
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
7474
"google-cloud-core >= 1.4.4, <3.0.0",
75-
"proto-plus >= 1.22.3, <2.0.0",
75+
"grpcio >= 1.33.2, < 2.0.0",
7676
count: 1
7777
- paths: [
7878
"packages/google-cloud-translate/testing/constraints-3.7.txt"
@@ -179,12 +179,10 @@ replacements:
179179
before: |
180180
google-api-core==1.34.1
181181
google-auth==2.14.1
182-
proto-plus==1.22.3
183182
after: |
184183
google-api-core==1.34.1
185-
google-auth==2.14.1
186184
pandas==0.23.2
187-
proto-plus==1.22.3
185+
google-auth==2.14.1
188186
count: 1
189187
- paths: [
190188
packages/google-cloud-monitoring/noxfile.py,
@@ -232,14 +230,12 @@ replacements:
232230
before: |
233231
google-api-core==1.34.1
234232
google-auth==2.14.1
235-
proto-plus==1.22.3
236233
after: |
237234
google-api-core==1.34.1
238-
google-auth==2.14.1
239235
google-cloud-storage==1.18.0
240236
libcst==0.2.5
241237
pandas==1.0.5
242-
proto-plus==1.22.3
238+
google-auth==2.14.1
243239
count: 1
244240
- paths: [
245241
packages/google-cloud-automl/docs/automl_v1beta1/services_.rst,

‎.librarian/generator-input/client-post-processing/mypy-error-with-org-policy-as-dependency.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,24 @@ replacements:
2323
# Exclude incompatible versions of `google-auth`
2424
# See https://github.com/googleapis/google-cloud-python/issues/12364
2525
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
26-
"proto-plus >= 1.22.3, <2.0.0",
26+
"grpcio >= 1.33.2, < 2.0.0",
2727
after: |
2828
dependencies = [
2929
"google-api-core[grpc] >= 1.34.1, <3.0.0,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
3030
# Exclude incompatible versions of `google-auth`
3131
# See https://github.com/googleapis/google-cloud-python/issues/12364
3232
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
3333
"google-cloud-org-policy >= 0.1.2, <2.0.0",
34-
"proto-plus >= 1.22.3, <2.0.0",
34+
"grpcio >= 1.33.2, < 2.0.0",
3535
count: 1
3636
- paths: [
3737
packages/google-cloud-asset/testing/constraints-3.7.txt
3838
]
3939
before: |
4040
google-api-core==1.34.1
4141
google-auth==2.14.1
42-
proto-plus==1.22.3
4342
after: |
4443
google-api-core==1.34.1
45-
google-auth==2.14.1
4644
google-cloud-org-policy==0.1.2
47-
proto-plus==1.22.3
45+
google-auth==2.14.1
4846
count: 1

0 commit comments

Comments
 (0)