Skip to content

Commit 61443c1

Browse files
committed
Merge remote-tracking branch 'tswast/main' into tswast-docs-deploy
2 parents 0ab8628 + f149bd7 commit 61443c1

102 files changed

Lines changed: 983 additions & 509 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.
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: Regenerate all packages after merging to main
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: read
10+
issues: write
11+
12+
jobs:
13+
regenerate:
14+
runs-on: ubuntu-latest
15+
env:
16+
PANDOC_VERSION: 3.8.2
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v6
21+
22+
- name: Install Go
23+
uses: actions/setup-go@v6
24+
with:
25+
go-version: '1.26.x'
26+
27+
- name: Install protoc
28+
uses: arduino/setup-protoc@v3
29+
with:
30+
version: "25.3"
31+
32+
- name: Install pandoc
33+
run: |
34+
mkdir /tmp/pandoc
35+
curl -fsSL --retry 5 --retry-delay 15 -o /tmp/pandoc.tar.gz \
36+
https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz
37+
tar -xvf /tmp/pandoc.tar.gz -C /tmp/pandoc --strip-components=1
38+
39+
- name: Install Python packages for Librarian
40+
run: |
41+
version=$(sed -n 's/^version: *//p' librarian.yaml)
42+
go run "github.com/googleapis/librarian/cmd/librarian@${version}" install
43+
44+
- name: Regenerate
45+
run: |
46+
version=$(sed -n 's/^version: *//p' librarian.yaml)
47+
PATH=$PATH:/tmp/pandoc/bin
48+
go run "github.com/googleapis/librarian/cmd/librarian@${version}" generate -all -v
49+
50+
- name: Create issue on diff
51+
env:
52+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53+
run: |
54+
if [ -n "$(git status --porcelain)" ]; then
55+
TITLE="Regeneration check found diff"
56+
RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
57+
DIFF_STAT=$(git diff --stat)
58+
BODY="The post-submit [regeneration check]($RUN_URL) found a diff.
59+
60+
Diff summary:
61+
\`\`\`
62+
$DIFF_STAT
63+
\`\`\`"
64+
65+
EXISTING_ISSUE=$(gh issue list --state open --search "in:title \"$TITLE\"" --json number --jq '.[0].number')
66+
if [ -z "$EXISTING_ISSUE" ]; then
67+
gh issue create --title "$TITLE" --body "$BODY"
68+
else
69+
echo "Issue #$EXISTING_ISSUE already exists, adding a comment."
70+
gh issue comment "$EXISTING_ISSUE" --body "Another failure with diff occurred: $RUN_URL"
71+
fi
72+
fi
73+
- name: Create issue on generation failure
74+
if: failure()
75+
env:
76+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77+
run: |
78+
TITLE="Regeneration failed"
79+
RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
80+
BODY="The post-submit [regeneration check]($RUN_URL) failed."
81+
EXISTING_ISSUE=$(gh issue list --state open --search "in:title \"$TITLE\"" --json number --jq '.[0].number')
82+
if [ -z "$EXISTING_ISSUE" ]; then
83+
gh issue create --title "$TITLE" --body "$BODY"
84+
else
85+
echo "Issue #$EXISTING_ISSUE already exists, adding a comment."
86+
gh issue comment "$EXISTING_ISSUE" --body "Another regeneration failure occurred: $RUN_URL"
87+
fi

.librarian/config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,12 @@ libraries:
3333
# TODO(https://github.com/googleapis/google-cloud-python/issues/16780): Disabling automatic releases until resolved.
3434
- id: "google-cloud-compute"
3535
release_blocked: true
36+
# TODO(https://github.com/googleapis/google-cloud-python/issues/16962):
37+
# Disable automatic releases until tests stabilize.
38+
- id: "pandas-gbq"
39+
release_blocked: true
40+
# TODO(https://github.com/googleapis/google-cloud-python/issues/16970):
41+
# Disable automatic releases until system tests are sped up or reorganized.
42+
- id: "google-cloud-firestore"
43+
release_blocked: true
3644

librarian.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ libraries:
748748
apis:
749749
- path: google/cloud/compute/v1beta
750750
python:
751-
issue_tracker_override: https://issuetracker.google.com/issues/new?component=187134&template=0
752751
default_version: v1beta
753752
- name: google-cloud-confidentialcomputing
754753
version: 0.9.0
@@ -1124,6 +1123,7 @@ libraries:
11241123
- docs/firestore_v1/transaction.rst
11251124
- docs/firestore_v1/transforms.rst
11261125
- docs/firestore_v1/types.rst
1126+
skip_release: true
11271127
python:
11281128
library_type: GAPIC_COMBO
11291129
opt_args_by_api:
@@ -1939,7 +1939,6 @@ libraries:
19391939
google/storage/v2:
19401940
- python-gapic-namespace=google.cloud
19411941
- python-gapic-name=_storage
1942-
issue_tracker_override: https://issuetracker.google.com/savedsearches/559782
19431942
metadata_name_override: storage
19441943
default_version: v2
19451944
- name: google-cloud-storage-control
@@ -2514,6 +2513,7 @@ libraries:
25142513
default_version: apiVersion
25152514
- name: pandas-gbq
25162515
version: 0.35.0
2516+
skip_release: true
25172517
python:
25182518
library_type: INTEGRATION
25192519
- name: proto-plus

packages/bigframes/CONTRIBUTING.rst

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ configure them just like the System Tests.
232232

233233
# Run all tests in a folder
234234
$ cd samples/snippets
235-
$ nox -s py-3.8
235+
$ nox -s py-3.10
236236

237237
# Run a single sample test
238238
$ cd samples/snippets
239-
$ nox -s py-3.8 -- -k <name of test>
239+
$ nox -s py-3.10 -- -k <name of test>
240240

241241
********************************************
242242
Note About ``README`` as it pertains to PyPI
@@ -276,17 +276,7 @@ Supported versions can be found in our ``noxfile.py`` `config`_.
276276
.. _config: https://github.com/googleapis/google-cloud-python/blob/main/packages/bigframes/noxfile.py
277277

278278

279-
We also explicitly decided to support Python 3 beginning with version 3.10.
280-
Reasons for this include:
281279

282-
- Encouraging use of newest versions of Python 3
283-
- Taking the lead of `prominent`_ open-source `projects`_
284-
- `Unicode literal support`_ which allows for a cleaner codebase that
285-
works in both Python 2 and Python 3
286-
287-
.. _prominent: https://docs.djangoproject.com/en/1.9/faq/install/#what-python-version-can-i-use-with-django
288-
.. _projects: http://flask.pocoo.org/docs/0.10/python3/
289-
.. _Unicode literal support: https://www.python.org/dev/peps/pep-0414/
290280

291281
**********
292282
Versioning

packages/bigframes/bigframes/session/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
from bigframes import version
8181
from bigframes.core import blocks, utils
8282
from bigframes.core.logging import log_adapter
83-
from bigframes.session import bigquery_session, bq_caching_executor, executor
83+
from bigframes.session import bigquery_session, executor, proxy_executor
8484

8585
# Avoid circular imports.
8686
if typing.TYPE_CHECKING:
@@ -327,15 +327,15 @@ def __init__(
327327
if not self._strictly_ordered:
328328
labels["bigframes-mode"] = "unordered"
329329

330-
self._executor: executor.Executor = bq_caching_executor.BigQueryCachingExecutor(
330+
self._executor: executor.Executor = proxy_executor.DualCompilerProxyExecutor(
331331
bqclient=self._clients_provider.bqclient,
332332
bqstoragereadclient=self._clients_provider.bqstoragereadclient,
333333
loader=self._loader,
334334
storage_manager=self._temp_storage_manager,
335335
metrics=self._metrics,
336336
enable_polars_execution=context.enable_polars_execution,
337337
publisher=self._publisher,
338-
labels=labels,
338+
labels=tuple(labels.items()),
339339
)
340340

341341
def __del__(self):

0 commit comments

Comments
 (0)