Skip to content

Commit 322e372

Browse files
jskeetjskeet
authored
chore: update to librarian v0.13.0 / generator 1.32.0 (with adjustments) (#17042)
Adjusts the string replacement post-processor configurations to be ready for librarian v0.13.0 which uses gapic-generator 1.32.0. This change does not include the results of regeneration; those changes will be done immediately afterwards, in batches.
1 parent 91fc06b commit 322e372

15 files changed

Lines changed: 63 additions & 956 deletions

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,17 @@ replacements:
1919
]
2020
before: |
2121
dependencies = \[
22-
"google-api-core\[grpc\] >= 2.11.0, <3.0.0",
22+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
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-
"grpcio >= 1.33.2, < 2.0.0",
26+
"grpcio >= 1.44.0, < 2.0.0",
2727
after: |
2828
dependencies = [
29-
"google-api-core[grpc] >= 2.11.0, <3.0.0",
29+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
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-
"grpcio >= 1.33.2, < 2.0.0",
35-
count: 1
36-
- paths: [
37-
packages/google-cloud-filestore/testing/constraints-3.9.txt
38-
]
39-
before: |
40-
google-api-core==2.21.0
41-
google-auth==2.35.0
42-
after: |
43-
google-api-core==2.21.0
44-
google-cloud-common==1.0.0
45-
google-auth==2.35.0
34+
"grpcio >= 1.44.0, < 2.0.0",
4635
count: 1

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

Lines changed: 25 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -11,175 +11,120 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
description: setup.py and testing/constraints-3.9.txt are missing necessary dependencies
14+
description: setup.py is missing necessary dependencies
1515
url: https://github.com/googleapis/gapic-generator-python/issues/1831
1616
replacements:
1717
- paths: [
1818
packages/google-cloud-gke-hub/setup.py
1919
]
2020
before: |
2121
dependencies = \[
22-
"google-api-core\[grpc\] >= 2.11.0, <3.0.0",
22+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
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-
"grpcio >= 1.33.2, < 2.0.0",
26+
"grpcio >= 1.44.0, < 2.0.0",
2727
after: |
2828
dependencies = [
29-
"google-api-core[grpc] >= 2.11.0, <3.0.0",
29+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
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-
"grpcio >= 1.33.2, < 2.0.0",
35-
count: 1
36-
- paths: [
37-
packages/google-cloud-gke-hub/testing/constraints-3.9.txt
38-
]
39-
before: |
40-
google-api-core==2.21.0
41-
google-auth==2.35.0
42-
after: |
43-
google-api-core==2.21.0
44-
grpc-google-iam-v1==0.12.4
45-
google-auth==2.35.0
34+
"grpcio >= 1.44.0, < 2.0.0",
4635
count: 1
4736
- paths: [
4837
packages/google-cloud-build/setup.py
4938
]
5039
before: |
5140
dependencies = \[
52-
"google-api-core\[grpc\] >= 2.11.0, <3.0.0",
41+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
5342
# Exclude incompatible versions of `google-auth`
5443
# See https://github.com/googleapis/google-cloud-python/issues/12364
5544
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
56-
"grpcio >= 1.33.2, < 2.0.0",
45+
"grpcio >= 1.44.0, < 2.0.0",
5746
after: |
5847
dependencies = [
59-
"google-api-core[grpc] >= 2.11.0, <3.0.0",
48+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
6049
# Exclude incompatible versions of `google-auth`
6150
# See https://github.com/googleapis/google-cloud-python/issues/12364
6251
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
6352
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
64-
"grpcio >= 1.33.2, < 2.0.0",
65-
count: 1
66-
- paths: [
67-
packages/google-cloud-build/testing/constraints-3.9.txt
68-
]
69-
before: |
70-
google-api-core==2.21.0
71-
google-auth==2.35.0
72-
after: |
73-
google-api-core==2.21.0
74-
grpc-google-iam-v1==0.12.4
75-
google-auth==2.35.0
53+
"grpcio >= 1.44.0, < 2.0.0",
7654
count: 1
7755
- paths: [
7856
packages/google-cloud-binary-authorization/setup.py
7957
]
8058
before: |
8159
dependencies = \[
82-
"google-api-core\[grpc\] >= 2.11.0, <3.0.0",
60+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
8361
# Exclude incompatible versions of `google-auth`
8462
# See https://github.com/googleapis/google-cloud-python/issues/12364
8563
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
86-
"grpcio >= 1.33.2, < 2.0.0",
64+
"grpcio >= 1.44.0, < 2.0.0",
8765
after: |
8866
dependencies = [
89-
"google-api-core[grpc] >= 2.11.0, <3.0.0",
67+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
9068
# Exclude incompatible versions of `google-auth`
9169
# See https://github.com/googleapis/google-cloud-python/issues/12364
9270
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
9371
"grafeas >= 1.7.0, <2.0",
94-
"grpcio >= 1.33.2, < 2.0.0",
95-
count: 1
96-
- paths: [
97-
packages/google-cloud-binary-authorization/testing/constraints-3.9.txt
98-
]
99-
before: |
100-
google-api-core==2.21.0
101-
google-auth==2.35.0
102-
after: |
103-
google-api-core==2.21.0
104-
grafeas==1.7.0
105-
google-auth==2.35.0
106-
count: 1
107-
- paths: [
108-
packages/google-cloud-iam/testing/constraints-3.9.txt
109-
]
110-
before: |
111-
google-api-core==2.21.0
112-
google-auth==2.35.0
113-
after: |
114-
google-api-core==2.21.0
115-
grpc-google-iam-v1==0.12.4
116-
google-auth==2.35.0
72+
"grpcio >= 1.44.0, < 2.0.0",
11773
count: 1
11874
- paths: [
11975
packages/google-cloud-iam/setup.py
12076
]
12177
before: |
12278
dependencies = \[
123-
"google-api-core\[grpc\] >= 2.11.0, <3.0.0",
79+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
12480
# Exclude incompatible versions of `google-auth`
12581
# See https://github.com/googleapis/google-cloud-python/issues/12364
12682
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
127-
"grpcio >= 1.33.2, < 2.0.0",
83+
"grpcio >= 1.44.0, < 2.0.0",
12884
after: |
12985
dependencies = [
130-
"google-api-core[grpc] >= 2.11.0, <3.0.0",
86+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
13187
# Exclude incompatible versions of `google-auth`
13288
# See https://github.com/googleapis/google-cloud-python/issues/12364
13389
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
13490
"grpc-google-iam-v1 >=0.12.4, <1.0.0",
135-
"grpcio >= 1.33.2, < 2.0.0",
91+
"grpcio >= 1.44.0, < 2.0.0",
13692
count: 1
13793
- paths: [
13894
packages/google-cloud-policysimulator/setup.py
13995
]
14096
before: |
14197
dependencies = \[
142-
"google-api-core\[grpc\] >= 2.11.0, <3.0.0",
98+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
14399
# Exclude incompatible versions of `google-auth`
144100
# See https://github.com/googleapis/google-cloud-python/issues/12364
145101
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
146-
"grpcio >= 1.33.2, < 2.0.0",
102+
"grpcio >= 1.44.0, < 2.0.0",
147103
after: |
148104
dependencies = [
149-
"google-api-core[grpc] >= 2.11.0, <3.0.0",
105+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
150106
# Exclude incompatible versions of `google-auth`
151107
# See https://github.com/googleapis/google-cloud-python/issues/12364
152108
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
153109
"google-cloud-org-policy >= 1.11.1, <2.0.0",
154-
"grpcio >= 1.33.2, < 2.0.0",
110+
"grpcio >= 1.44.0, < 2.0.0",
155111
count: 1
156112
- paths: [
157113
packages/google-shopping-merchant-notifications/setup.py
158114
]
159115
before: |
160116
dependencies = \[
161-
"google-api-core\[grpc\] >= 2.11.0, <3.0.0",
117+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
162118
# Exclude incompatible versions of `google-auth`
163119
# See https://github.com/googleapis/google-cloud-python/issues/12364
164120
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
165-
"grpcio >= 1.33.2, < 2.0.0",
121+
"grpcio >= 1.44.0, < 2.0.0",
166122
after: |
167123
dependencies = [
168-
"google-api-core[grpc] >= 2.11.0, <3.0.0",
124+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
169125
# Exclude incompatible versions of `google-auth`
170126
# See https://github.com/googleapis/google-cloud-python/issues/12364
171127
"google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",
172128
"google-shopping-type >= 1.0.0, <2.0.0",
173-
"grpcio >= 1.33.2, < 2.0.0",
174-
count: 1
175-
- paths: [
176-
packages/google-shopping-merchant-notifications/testing/constraints-3.9.txt
177-
]
178-
before: |
179-
google-api-core==2.21.0
180-
google-auth==2.35.0
181-
after: |
182-
google-api-core==2.21.0
183-
google-shopping-type==1.0.0
184-
google-auth==2.35.0
129+
"grpcio >= 1.44.0, < 2.0.0",
185130
count: 1

‎.librarian/generator-input/client-post-processing/allow-docs-warnings.yaml‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -450,24 +450,6 @@ replacements:
450450
"BigQueryWriteClient",
451451
)
452452
count: 1
453-
- paths: [
454-
packages/google-cloud-bigquery-storage/testing/constraints-3.9.txt,
455-
]
456-
before: |
457-
google-api-core==2.21.0
458-
google-auth==2.35.0
459-
after: |
460-
google-api-core==2.21.0
461-
libcst==0.2.5
462-
fastavro==1.1.0
463-
# pytz is required by pandas
464-
pytz
465-
pandas==1.1.3
466-
# numpy is a dependency of pandas
467-
numpy==1.19.3
468-
pyarrow==3.0.0
469-
google-auth==2.35.0
470-
count: 1
471453
# Given that this file is mostly handwritten, we could omit the file during code generation
472454
# This will require a change to gapic-generator-python to provide the ability to omit files
473455
- paths: [

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,6 @@ replacements:
203203
"google-crc32c>=1.5.0, <2.0.0dev",
204204
]
205205
count: 1
206-
- paths: [
207-
packages/google-cloud-bigtable/testing/constraints-3.9.txt
208-
]
209-
before: |
210-
google-api-core==2.21.0
211-
google-auth==2.35.0
212-
after: |
213-
google-api-core==2.21.0
214-
google-cloud-core==2.0.0
215-
grpc-google-iam-v1==0.12.4
216-
google-auth==2.35.0
217-
count: 1
218206
- paths: [
219207
packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/async_client.py,
220208
packages/google-cloud-bigtable/google/cloud/bigtable_v2/services/bigtable/client.py,

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,19 @@ replacements:
1919
]
2020
before: |
2121
dependencies = \[
22-
"google-api-core\[grpc\] >= 2.11.0, <3.0.0",
22+
"google-api-core\[grpc\] >= 2.17.1, <3.0.0",
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-
"grpcio >= 1.33.2, < 2.0.0",
26+
"grpcio >= 1.44.0, < 2.0.0",
2727
after: |
2828
dependencies = [
29-
"google-api-core[grpc] >= 2.11.0, <3.0.0",
29+
"google-api-core[grpc] >= 2.17.1, <3.0.0",
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.7.0, <2.0",
34-
"grpcio >= 1.33.2, < 2.0.0",
35-
count: 1
36-
- paths: [
37-
packages/google-cloud-containeranalysis/testing/constraints-3.9.txt
38-
]
39-
before: |
40-
google-api-core==2.21.0
41-
google-auth==2.35.0
42-
after: |
43-
google-api-core==2.21.0
44-
grafeas==1.7.0
45-
google-auth==2.35.0
34+
"grpcio >= 1.44.0, < 2.0.0",
4635
count: 1
4736
- paths: [
4837
packages/google-cloud-containeranalysis/google/cloud/devtools/containeranalysis_v1/services/container_analysis/client.py,

0 commit comments

Comments
 (0)