Skip to content

Commit dd2b275

Browse files
authored
Merge branch 'main' into feat/drop-python-3.7-3.9-google-crc32c
2 parents 4669b87 + 6cae9e8 commit dd2b275

3,540 files changed

Lines changed: 332863 additions & 64174 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/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# - @googleapis/gcs-team
2222
# - @googleapis/pubsub-team
2323
# - @googleapis/spanner-team
24+
# - @googleapis/cloud-sdk-librarian-team
2425

2526
# As per the above, the following list is only used for notifications, not for approvals.
2627
# Googlers see b/477912165 and corresponding design doc
@@ -44,3 +45,4 @@
4445
/packages/pandas-gbq/ @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
4546
/packages/sqlalchemy-bigquery/ @googleapis/bigquery-team @googleapis/bigquery-dataframe-team
4647
/packages/sqlalchemy-spanner/ @googleapis/spanner-team
48+
/librarian.yaml @googleapis/cloud-sdk-librarian-team

.github/workflows/bigtable-conformance.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
outputs:
2222
run_bigtable: ${{ steps.filter.outputs.bigtable }}
2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: dorny/paths-filter@v3
24+
- uses: actions/checkout@v6
25+
- uses: dorny/paths-filter@v4
2626
id: filter
2727
with:
2828
filters: |
@@ -48,18 +48,18 @@ jobs:
4848
fail-fast: false
4949
name: "${{ matrix.client-type }} client / python ${{ matrix.py-version }} / test tag ${{ matrix.test-version }}"
5050
steps:
51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v6
5252
name: "Checkout google-cloud-python"
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v6
5454
name: "Checkout conformance tests"
5555
with:
5656
repository: googleapis/cloud-bigtable-clients-test
5757
ref: ${{ matrix.test-version }}
5858
path: packages/google-cloud-bigtable/cloud-bigtable-clients-test
59-
- uses: actions/setup-python@v5
59+
- uses: actions/setup-python@v6
6060
with:
6161
python-version: ${{ matrix.py-version }}
62-
- uses: actions/setup-go@v5
62+
- uses: actions/setup-go@v6
6363
with:
6464
go-version: '>=1.20.2'
6565
- run: pip install -e .

.github/workflows/django-spanner-django3.2_tests_against_emulator0.yml

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

.github/workflows/django-spanner-django3.2_tests_against_emulator1.yml

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

.github/workflows/django-spanner-django3.2_tests_against_emulator2.yml

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

.github/workflows/django-spanner-django3.2_tests_against_emulator3.yml

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

.github/workflows/django-spanner-django3.2_tests_against_emulator4.yml

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

0 commit comments

Comments
 (0)