Skip to content
This repository was archived by the owner on Feb 26, 2026. It is now read-only.

Commit 3e16ec9

Browse files
committed
Merge branch 'main' into sanche-add-314-support
2 parents e6e5d63 + 36fb427 commit 3e16ec9

37 files changed

Lines changed: 810 additions & 242 deletions

.github/.OwlBot.yaml

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

.github/auto-approve.yml

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

.github/release-please.yml

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

.github/release-trigger.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"name": "logging",
3+
"name_pretty": "Cloud Logging",
4+
"product_documentation": "https://cloud.google.com/logging/docs",
5+
"client_documentation": "https://cloud.google.com/python/docs/reference/logging/latest",
6+
"issue_tracker": "https://issuetracker.google.com/savedsearches/559764",
7+
"release_level": "stable",
8+
"language": "python",
9+
"library_type": "GAPIC_COMBO",
10+
"repo": "googleapis/python-logging",
11+
"distribution_name": "google-cloud-logging",
12+
"api_id": "logging.googleapis.com",
13+
"codeowner_team": "@googleapis/api-logging @googleapis/api-logging-partners",
14+
"default_version": "v2",
15+
"api_shortname": "logging",
16+
"api_description": "allows you to store, search, analyze, monitor, and alert on log data and events from Google Cloud and Amazon Web Services. Using the BindPlane service, you can also collect this data from over 150 common application components, on-premises systems, and hybrid cloud systems. BindPlane is included with your Google Cloud project at no additional cost."
17+
}

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

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,17 @@ def place_before(path, text, *before_text, escape=None):
6565
)
6666

6767
s.move([library], excludes=[
68-
"**/gapic_version.py",
6968
"setup.py",
7069
"testing/constraints*.txt",
7170
"README.rst",
7271
"google/cloud/logging/__init__.py", # generated types are hidden from users
7372
"google/cloud/logging_v2/__init__.py",
73+
"docs/conf.py",
7474
"docs/index.rst",
7575
"docs/logging_v2", # Don't include gapic library docs. Users should use the hand-written layer instead
7676
"docs/multiprocessing.rst",
7777
"scripts/fixup_logging_v2_keywords.py", # don't include script since it only works for generated layer
78+
"noxfile.py",
7879
],
7980
)
8081

@@ -104,21 +105,13 @@ def place_before(path, text, *before_text, escape=None):
104105
s.move(templated_files,
105106
excludes=[
106107
"docs/index.rst",
107-
".github/release-please.yml",
108+
".github/**",
109+
".kokoro/**",
108110
".coveragerc",
109111
"docs/multiprocessing.rst",
110-
".github/workflows", # exclude gh actions as credentials are needed for tests
111-
".github/auto-label.yaml",
112112
"README.rst", # This repo has a customized README
113113
],
114114
)
115-
s.replace("noxfile.py",
116-
"""prerel_deps = \[
117-
"protobuf",""",
118-
"""prerel_deps = [
119-
"google-cloud-audit-log",
120-
"protobuf",""",
121-
)
122115

123116
# adjust .trampolinerc for environment tests
124117
s.replace(".trampolinerc", "required_envvars[^\)]*\)", "required_envvars+=()")
@@ -249,21 +242,3 @@ def place_before(path, text, *before_text, escape=None):
249242
s.replace(sample_files, text, replacement)
250243

251244
s.shell.run(["nox", "-s", "blacken"], hide_output=False)
252-
s.shell.run(["nox", "-s", "blacken"], cwd="samples/snippets", hide_output=False)
253-
254-
# --------------------------------------------------------------------------
255-
# Modify test configs
256-
# --------------------------------------------------------------------------
257-
258-
# add shared environment variables to test configs
259-
tracked_subdirs = ["continuous", "presubmit", "samples"]
260-
for subdir in tracked_subdirs:
261-
for path, subdirs, files in os.walk(f".kokoro/{subdir}"):
262-
for name in files:
263-
if name == "common.cfg":
264-
file_path = os.path.join(path, name)
265-
s.move(
266-
".kokoro/common_env_vars.cfg",
267-
file_path,
268-
merge=lambda src, dst, _,: f"{dst}\n{src}",
269-
)

0 commit comments

Comments
 (0)