Skip to content

Commit 85bf48f

Browse files
committed
Merge branch 'main' into shuowei-anywidget-extraneous-output
2 parents a139c65 + 4e535d2 commit 85bf48f

135 files changed

Lines changed: 31998 additions & 8441 deletions

File tree

Some content is hidden

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

.generator/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ RUN unzip protoc-25.3-linux-x86_64.zip -d protoc
6666

6767
# Download/extract pandoc
6868
# Pandoc is required by gapic-generator-python for parsing documentation
69+
# version-scanner: ignore-next-line
6970
ENV PANDOC_VERSION=3.8.2
7071
RUN mkdir pandoc-binary
7172
RUN wget https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz

.generator/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ def _run_post_processor(output: str, library_id: str, is_mono_repo: bool):
354354
# TODO(https://github.com/googleapis/google-cloud-python/issues/15538):
355355
# Investigate if a `target_version needs to be maintained
356356
# or can be eliminated.
357-
target_version = "py39"
357+
target_version = "py310"
358358
common_args = [
359359
f"--target-version={target_version}",
360360
"--line-length=88",

.generator/test_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ def test_run_individual_session_success(mocker, caplog, is_mono_repo):
741741
"cli.subprocess.run", return_value=MagicMock(returncode=0)
742742
)
743743

744-
test_session = "unit-3.9"
744+
test_session = "unit-3.10"
745745
test_library_id = "test-library"
746746
repo = "repo"
747747
_run_individual_session(test_session, test_library_id, repo, is_mono_repo)

.github/workflows/gapic-generator-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
SHOWCASE_VERSION: 0.35.0
1919
PROTOC_VERSION: 3.20.2
2020
LATEST_STABLE_PYTHON: 3.14
21-
ALL_PYTHON: "['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']"
21+
ALL_PYTHON: "['3.10', '3.11', '3.12', '3.13', '3.14']"
2222

2323
jobs:
2424
check_changes:

.kokoro/system.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,24 @@ for path in `find 'packages' \
133133
package_path="packages/${package_name}"
134134

135135
# Determine if we should skip based on git diff
136-
files_to_check="${package_path}/CHANGELOG.md"
136+
# We always check for changes in these specific versioning/config files
137+
files_to_check=(
138+
"${package_path}/CHANGELOG.md"
139+
"${package_path}/setup.py"
140+
"${package_path}/pyproject.toml"
141+
"${package_path}/**/gapic_version.py"
142+
"${package_path}/**/version.py"
143+
)
144+
145+
# If the package is in our "always run full system tests" list, check the whole directory
137146
if [[ $package_name == @($packages_with_system_tests_pattern) ]]; then
138-
files_to_check="${package_path}"
147+
files_to_check=("${package_path}")
139148
fi
140149

141-
echo "checking changes with 'git diff "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}" -- ${files_to_check}'"
150+
echo "checking changes with 'git diff ${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT} -- ${files_to_check[*]}'"
142151
set +e
143-
package_modified=$(git diff "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}" -- ${files_to_check} | wc -l)
152+
# Passing the array expanded as arguments to git diff
153+
package_modified=$(git diff "${KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH}...${KOKORO_GITHUB_PULL_REQUEST_COMMIT}" -- "${files_to_check[@]}" | wc -l)
144154
set -e
145155

146156
if [[ "${package_modified}" -gt 0 || "$KOKORO_BUILD_ARTIFACTS_SUBDIR" == *"continuous"* ]]; then

.librarian/config.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,10 @@ libraries:
2727
# Allow release for google-crc32c once this bug is fixed.
2828
- id: "google-crc32c"
2929
release_blocked: true
30-
# TODO(https://github.com/googleapis/google-cloud-python/issues/16780):
31-
# Allow release for google-cloud-compute (and beta) after we've checked that
32-
# the gRPC service config is okay.
33-
- id: "google-cloud-compute"
34-
release_blocked: true
35-
- id: "google-cloud-compute-v1beta"
36-
release_blocked: true
3730
# TODO(b/501132869): Disabling automatic releases until resolved.
3831
- id: "google-cloud-bigtable"
3932
release_blocked: true
33+
# TODO(https://github.com/googleapis/google-cloud-python/issues/16780): Disabling automatic releases until resolved.
34+
- id: "google-cloud-compute"
35+
release_blocked: true
36+

0 commit comments

Comments
 (0)