Skip to content

Commit 430de34

Browse files
committed
Merge main
2 parents b04eb14 + 34ca90e commit 430de34

3,436 files changed

Lines changed: 259096 additions & 156069 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.

.github/workflows/librarian_tidy.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: librarian tidy
22

33
on:
44
pull_request:
5-
paths:
6-
- 'librarian.yaml'
75

86
permissions:
97
contents: read
@@ -14,19 +12,21 @@ jobs:
1412
steps:
1513
- name: Checkout
1614
uses: actions/checkout@v6
17-
18-
- name: Install Go
19-
uses: actions/setup-go@v6
15+
- uses: dorny/paths-filter@v4
16+
id: changes
2017
with:
21-
go-version: '1.26.x'
18+
filters: |
19+
librarian:
20+
- 'librarian.yaml'
21+
22+
- uses: googleapis/librarian@main
2223

2324
- name: Run librarian tidy
24-
run: |
25-
V=$(go run github.com/googleapis/librarian/cmd/librarian@latest config get version)
26-
go run github.com/googleapis/librarian/cmd/librarian@${V} tidy
27-
git diff
25+
if: steps.changes.outputs.librarian == 'true'
26+
run: librarian tidy
2827

2928
- name: Check for diff
29+
if: steps.changes.outputs.librarian == 'true'
3030
run: |
3131
if ! git diff --exit-code; then
3232
V=$(go run github.com/googleapis/librarian/cmd/librarian@latest config get version)

.github/workflows/regenerate-all.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,10 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v6
2222

23-
- name: Install Go
24-
uses: actions/setup-go@v6
23+
- uses: googleapis/librarian@main
2524
with:
26-
go-version: '1.26.x'
27-
28-
- name: Install protoc
29-
uses: arduino/setup-protoc@v3
30-
with:
31-
version: "25.3"
25+
protoc-version: "25.3"
26+
protoc-checksum: "5ec3474ca09df0511bb2ca66b5ca091fa8943c30aa26285f225d0b1ba60b5665b3419be4cd2322decbb55464039ca0a0405a47e86bcc11491589405d615d280e"
3227

3328
- name: Install pandoc
3429
run: |
@@ -38,21 +33,20 @@ jobs:
3833
tar -xvf /tmp/pandoc.tar.gz -C /tmp/pandoc --strip-components=1
3934
4035
- name: Install Python packages for Librarian
41-
run: |
42-
version=$(sed -n 's/^version: *//p' librarian.yaml)
43-
go run "github.com/googleapis/librarian/cmd/librarian@${version}" install
36+
run: librarian install
4437

4538
- name: Clone Synthtool Templates
4639
run: |
4740
git clone --recurse-submodules --single-branch https://github.com/googleapis/synthtool.git /home/runner/synthtool
4841
4942
- name: Regenerate
5043
run: |
51-
version=$(sed -n 's/^version: *//p' librarian.yaml)
5244
PATH=$PATH:/tmp/pandoc/bin
53-
go run "github.com/googleapis/librarian/cmd/librarian@${version}" generate -all -v
45+
librarian generate -all -v
46+
git diff --exit-code
5447
5548
- name: Create issue on diff
49+
if: failure()
5650
env:
5751
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5852
run: |

.github/workflows/unittest.yml

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -48,71 +48,6 @@ jobs:
4848
with:
4949
name: coverage-artifact-${{ '{{' }} matrix.python {{ '}}' }}
5050
path: .coverage-${{ matrix.python }}
51-
unit-prerelease:
52-
name: ${{ matrix.option }}
53-
runs-on: ubuntu-latest
54-
strategy:
55-
matrix:
56-
python: ["3.14"]
57-
option: ["prerelease"]
58-
steps:
59-
- name: Checkout
60-
uses: actions/checkout@v4
61-
# Use a fetch-depth of 2 to avoid error `fatal: origin/main...HEAD: no merge base`
62-
# See https://github.com/googleapis/google-cloud-python/issues/12013
63-
# and https://github.com/actions/checkout#checkout-head.
64-
with:
65-
fetch-depth: 2
66-
- name: Setup Python
67-
uses: actions/setup-python@v5
68-
with:
69-
python-version: ${{ matrix.python }}
70-
allow-prereleases: true
71-
- name: Install nox
72-
run: |
73-
python -m pip install --upgrade setuptools pip wheel
74-
python -m pip install nox
75-
- name: Run ${{ matrix.option }} tests
76-
env:
77-
BUILD_TYPE: presubmit
78-
TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref }}
79-
TEST_TYPE: ${{ matrix.option }}
80-
# TODO(https://github.com/googleapis/google-cloud-python/issues/13775): Specify `PY_VERSION` rather than relying on the default python version of the nox session.
81-
PY_VERSION: "unused"
82-
run: |
83-
ci/run_conditional_tests.sh
84-
unit-core-deps-from-source:
85-
name: ${{ matrix.option }}
86-
runs-on: ubuntu-latest
87-
strategy:
88-
matrix:
89-
python: ["3.14"]
90-
option: ["core_deps_from_source-3.14"]
91-
steps:
92-
- name: Checkout
93-
uses: actions/checkout@v4
94-
# Use a fetch-depth of 2 to avoid error `fatal: origin/main...HEAD: no merge base`
95-
# See https://github.com/googleapis/google-cloud-python/issues/12013
96-
# and https://github.com/actions/checkout#checkout-head.
97-
with:
98-
fetch-depth: 2
99-
- name: Setup Python
100-
uses: actions/setup-python@v5
101-
with:
102-
python-version: ${{ matrix.python }}
103-
- name: Install nox
104-
run: |
105-
python -m pip install --upgrade setuptools pip wheel
106-
python -m pip install nox
107-
- name: Run ${{ matrix.option }} tests
108-
env:
109-
BUILD_TYPE: presubmit
110-
TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref }}
111-
TEST_TYPE: ${{ matrix.option }}
112-
# TODO(https://github.com/googleapis/google-cloud-python/issues/13775): Specify `PY_VERSION` rather than relying on the default python version of the nox session.
113-
PY_VERSION: "unused"
114-
run: |
115-
ci/run_conditional_tests.sh
11651

11752
cover:
11853
runs-on: ubuntu-latest
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Only run this nox session.
4+
env_vars: {
5+
key: "NOX_SESSION"
6+
value: "benchmark"
7+
}
8+
9+
env_vars: {
10+
key: "BENCHMARK_AND_PUBLISH"
11+
value: "true"
12+
}
13+
14+
env_vars: {
15+
key: "GOOGLE_CLOUD_PROJECT"
16+
value: "bigframes-benchmarking"
17+
}
18+
19+
env_vars: {
20+
key: "BIGFRAMES_TEST_MODEL_VERTEX_ENDPOINT"
21+
value: "https://us-central1-aiplatform.googleapis.com/v1/projects/272725758477/locations/us-central1/endpoints/590545496255234048"
22+
}

.kokoro/continuous/continuous-bigframes.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Only run these nox sessions.
44
env_vars: {
55
key: "NOX_SESSION"
6-
value: "e2e load system_prerelease notebook system_noextras"
6+
value: "e2e system_prerelease notebook system_noextras"
77
}
88

99
env_vars: {
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# Only run this nox session.
44
env_vars: {
55
key: "NOX_SESSION"
6-
value: "prerelease_deps"
6+
value: "notebook"
77
}
88

99
env_vars: {
10-
key: "BIGFRAMES_TEST_PROJECT"
11-
value: "bigframes-testing"
12-
}
10+
key: "GOOGLE_CLOUD_PROJECT"
11+
value: "bigframes-testing"
12+
}

.kokoro/presubmit/head.cfg

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

.kokoro/system.sh

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -90,35 +90,9 @@ run_package_test() {
9090
return $res
9191
}
9292

93-
packages_with_system_tests=(
94-
"bigframes"
95-
"google-auth"
96-
"google-cloud-bigquery-storage"
97-
"google-cloud-bigtable"
98-
"google-cloud-compute"
99-
"google-cloud-compute-v1beta"
100-
"google-cloud-datastore"
101-
"google-cloud-dns"
102-
"google-cloud-error-reporting"
103-
"google-cloud-firestore"
104-
"google-cloud-logging"
105-
"google-cloud-ndb"
106-
"google-cloud-pubsub"
107-
"google-cloud-spanner"
108-
"google-cloud-storage"
109-
"google-cloud-testutils"
110-
"pandas-gbq"
111-
"sqlalchemy-bigquery"
112-
"sqlalchemy-spanner"
113-
)
114-
11593
# A file for running system tests
11694
system_test_script="${PROJECT_ROOT}/.kokoro/system-single.sh"
11795

118-
# Join array elements with | for the pattern match
119-
packages_with_system_tests_pattern=$(printf "|*%s*" "${packages_with_system_tests[@]}")
120-
packages_with_system_tests_pattern="${packages_with_system_tests_pattern:1}" # Remove the leading pipe
121-
12296
# Run system tests for each package with directory packages/*/tests/system
12397
for path in `find 'packages' \
12498
\( -type d -wholename 'packages/*/tests/system' \) -o \
@@ -142,8 +116,20 @@ for path in `find 'packages' \
142116
"${package_path}/**/version.py"
143117
)
144118

145-
# If the package is in our "always run full system tests" list, check the whole directory
146-
if [[ $package_name == @($packages_with_system_tests_pattern) ]]; then
119+
# Hand-written (non-GAPIC_AUTO) packages or google-cloud-compute should check
120+
# the whole directory for changes.
121+
metadata="${package_path}/.repo-metadata.json"
122+
library_type="UNKNOWN"
123+
if [ -f "$metadata" ]; then
124+
library_type=$(sed -n 's/.*"library_type":[[:space:]]*"\([^"]*\)".*/\1/p' "$metadata")
125+
library_type="${library_type:-UNKNOWN}"
126+
fi
127+
128+
# System tests always run in release PRs, regardless of library type.
129+
# Automated GAPIC libraries bypass system tests in non-release PRs because their generation is deterministic.
130+
# However, google-cloud-compute is included because its Discovery-based nature requires additional
131+
# verification.
132+
if [[ "${library_type}" != "GAPIC_AUTO" || "${package_name}" == "google-cloud-compute"* ]]; then
147133
files_to_check=("${package_path}")
148134
fi
149135

.librarian/config.yaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ libraries:
2323
# Allow release for google-crc32c once this bug is fixed.
2424
- id: "google-crc32c"
2525
release_blocked: true
26-
# TODO(b/501132869): Disabling automatic releases until resolved.
27-
- id: "google-cloud-bigtable"
28-
release_blocked: true
2926
# TODO(https://github.com/googleapis/google-cloud-python/issues/16962):
3027
# Disable automatic releases until tests stabilize.
3128
- id: "pandas-gbq"
@@ -34,4 +31,18 @@ libraries:
3431
# Disable automatic releases until system tests are sped up or reorganized.
3532
- id: "google-cloud-firestore"
3633
release_blocked: true
34+
# TODO(https://github.com/googleapis/google-cloud-python/issues/17287):
35+
# Allow releases for sqlalchemy-bigquery once the bug above is fixed.
36+
- id: "sqlalchemy-bigquery"
37+
release_blocked: true
38+
# TODO(https://github.com/googleapis/google-cloud-python/issues/17327)
39+
- id: "google-cloud-bigquery"
40+
release_blocked: true
41+
# TODO(https://github.com/googleapis/google-cloud-python/issues/17327)
42+
- id: "google-cloud-bigtable"
43+
release_blocked: true
44+
# TODO(https://github.com/googleapis/google-cloud-python/issues/17334)
45+
- id: "google-auth"
46+
release_blocked: true
47+
3748

0 commit comments

Comments
 (0)