Skip to content

Commit cb9321f

Browse files
authored
Merge branch 'googleapis:main' into main
2 parents 33a998e + ddce7e5 commit cb9321f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+4954
-1345
lines changed

.flake8

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
# -*- coding: utf-8 -*-
2-
#
3-
# Copyright 2024 Google LLC
2+
# Copyright 2025 Google LLC
43
#
54
# Licensed under the Apache License, Version 2.0 (the "License");
65
# you may not use this file except in compliance with the License.
76
# You may obtain a copy of the License at
87
#
9-
# https://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
109
#
1110
# Unless required by applicable law or agreed to in writing, software
1211
# distributed under the License is distributed on an "AS IS" BASIS,
1312
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1413
# See the License for the specific language governing permissions and
1514
# limitations under the License.
16-
17-
# Generated by synthtool. DO NOT EDIT!
15+
#
1816
[flake8]
17+
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2333):
18+
# Resolve flake8 lint issues
1919
ignore = E203, E231, E266, E501, W503
2020
exclude =
21-
# Exclude generated code.
22-
**/proto/**
21+
# TODO(https://github.com/googleapis/gapic-generator-python/issues/2333):
22+
# Ensure that generated code passes flake8 lint
2323
**/gapic/**
2424
**/services/**
2525
**/types/**
26+
# Exclude Protobuf gencode
2627
*_pb2.py
2728

2829
# Standard linting exemptions.

.github/.OwlBot.lock.yaml

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

.github/.OwlBot.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "storage",
3+
"name_pretty": "Google Cloud Storage",
4+
"product_documentation": "https://cloud.google.com/storage",
5+
"client_documentation": "https://cloud.google.com/python/docs/reference/storage/latest",
6+
"issue_tracker": "https://issuetracker.google.com/savedsearches/559782",
7+
"release_level": "stable",
8+
"language": "python",
9+
"library_type": "GAPIC_MANUAL",
10+
"repo": "googleapis/python-storage",
11+
"distribution_name": "google-cloud-storage",
12+
"api_id": "storage.googleapis.com",
13+
"requires_billing": true,
14+
"default_version": "v2",
15+
"codeowner_team": "@googleapis/gcs-sdk-team",
16+
"api_shortname": "storage",
17+
"api_description": "is a durable and highly available object storage service. Google Cloud Storage is almost infinitely scalable and guarantees consistency: when a write succeeds, the latest copy of the object will be returned to any GET, globally."
18+
}

owlbot.py renamed to .librarian/generator-input/librarian.py

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -98,41 +98,11 @@
9898
"noxfile.py",
9999
"CONTRIBUTING.rst",
100100
"README.rst",
101-
".kokoro/continuous/continuous.cfg",
102-
".kokoro/presubmit/system-3.8.cfg",
103-
".kokoro/presubmit/prerelease-deps.cfg",
104-
".kokoro/continuous/prerelease-deps.cfg",
105-
".github/blunderbuss.yml", # blunderbuss assignment to python squad
106-
".github/workflows", # exclude gh actions as credentials are needed for tests
107-
".github/release-please.yml", # special support for a python2 branch in this repo
101+
".kokoro/**",
102+
".github/**",
108103
],
109104
)
110105

111-
s.replace(
112-
".kokoro/build.sh",
113-
"export PYTHONUNBUFFERED=1",
114-
"""export PYTHONUNBUFFERED=1
115-
116-
# Export variable to override api endpoint
117-
export API_ENDPOINT_OVERRIDE
118-
119-
# Export variable to override api endpoint version
120-
export API_VERSION_OVERRIDE
121-
122-
# Export dual region locations
123-
export DUAL_REGION_LOC_1
124-
export DUAL_REGION_LOC_2
125-
126-
# Setup universe domain testing needed environment variables.
127-
export TEST_UNIVERSE_DOMAIN_CREDENTIAL=$(realpath ${KOKORO_GFILE_DIR}/secret_manager/client-library-test-universe-domain-credential)
128-
export TEST_UNIVERSE_DOMAIN=$(gcloud secrets versions access latest --project cloud-devrel-kokoro-resources --secret=client-library-test-universe-domain)
129-
export TEST_UNIVERSE_PROJECT_ID=$(gcloud secrets versions access latest --project cloud-devrel-kokoro-resources --secret=client-library-test-universe-project-id)
130-
export TEST_UNIVERSE_LOCATION=$(gcloud secrets versions access latest --project cloud-devrel-kokoro-resources --secret=client-library-test-universe-storage-location)
131-
132-
""")
133-
134106
python.py_samples(skip_readmes=True)
135107

136-
# Use a python runtime which is available in the owlbot post processor here
137-
# https://github.com/googleapis/synthtool/blob/master/docker/owlbot/python/Dockerfile
138-
s.shell.run(["nox", "-s", "blacken-3.10"], hide_output=False)
108+
s.shell.run(["nox", "-s", "blacken"], hide_output=False)

0 commit comments

Comments
 (0)