Skip to content

Commit a8e81fb

Browse files
Linchingcf-owl-bot[bot]
Linchin
and
gcf-owl-bot[bot]
authored
chore: update templated files (#1122)
* chore: update templated files * remove duplicate config * remove duplicate config in owlbot.py instead * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * remove owtbot modification unnecessary after update * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * add the replacement back but replace unit instead * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * change the order of installation * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * correct string match * correct owlbot string match * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * try a different match * use a different way to replace string --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent aaa73aa commit a8e81fb

25 files changed

+385
-334
lines changed

‎.coveragerc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Copyright 2023 Google LLC
3+
# Copyright 2024 Google LLC
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎.flake8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# Copyright 2023 Google LLC
3+
# Copyright 2024 Google LLC
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎.github/.OwlBot.lock.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:5a4c19d17e597b92d786e569be101e636c9c2817731f80a5adec56b2aa8fe070
17-
# created: 2024-04-12T11:35:58.922854369Z
16+
digest: sha256:e8dcfd7cbfd8beac3a3ff8d3f3185287ea0625d859168cc80faccfc9a7a00455
17+
# created: 2024-09-16T21:04:09.091105552Z

‎.github/auto-label.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 Google LLC
1+
# Copyright 2024 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎.kokoro/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2023 Google LLC
2+
# Copyright 2024 Google LLC
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

‎.kokoro/docker/docs/Dockerfile

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 Google LLC
1+
# Copyright 2024 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from ubuntu:22.04
15+
from ubuntu:24.04
1616

1717
ENV DEBIAN_FRONTEND noninteractive
1818

@@ -40,7 +40,6 @@ RUN apt-get update \
4040
libssl-dev \
4141
libsqlite3-dev \
4242
portaudio19-dev \
43-
python3-distutils \
4443
redis-server \
4544
software-properties-common \
4645
ssh \
@@ -60,28 +59,31 @@ RUN apt-get update \
6059
&& rm -rf /var/lib/apt/lists/* \
6160
&& rm -f /var/cache/apt/archives/*.deb
6261

63-
###################### Install python 3.9.13
6462

65-
# Download python 3.9.13
66-
RUN wget https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tgz
63+
###################### Install python 3.10.14 for docs/docfx session
64+
65+
# Download python 3.10.14
66+
RUN wget https://www.python.org/ftp/python/3.10.14/Python-3.10.14.tgz
6767

6868
# Extract files
69-
RUN tar -xvf Python-3.9.13.tgz
69+
RUN tar -xvf Python-3.10.14.tgz
7070

71-
# Install python 3.9.13
72-
RUN ./Python-3.9.13/configure --enable-optimizations
71+
# Install python 3.10.14
72+
RUN ./Python-3.10.14/configure --enable-optimizations
7373
RUN make altinstall
7474

75+
ENV PATH /usr/local/bin/python3.10:$PATH
76+
7577
###################### Install pip
7678
RUN wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
77-
&& python3 /tmp/get-pip.py \
79+
&& python3.10 /tmp/get-pip.py \
7880
&& rm /tmp/get-pip.py
7981

8082
# Test pip
81-
RUN python3 -m pip
83+
RUN python3.10 -m pip
8284

8385
# Install build requirements
8486
COPY requirements.txt /requirements.txt
85-
RUN python3 -m pip install --require-hashes -r requirements.txt
87+
RUN python3.10 -m pip install --require-hashes -r requirements.txt
8688

87-
CMD ["python3.8"]
89+
CMD ["python3.10"]

‎.kokoro/docker/docs/requirements.txt

+22-18
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
# pip-compile --allow-unsafe --generate-hashes requirements.in
66
#
7-
argcomplete==3.2.3 \
8-
--hash=sha256:bf7900329262e481be5a15f56f19736b376df6f82ed27576fa893652c5de6c23 \
9-
--hash=sha256:c12355e0494c76a2a7b73e3a59b09024ca0ba1e279fb9ed6c1b82d5b74b6a70c
7+
argcomplete==3.4.0 \
8+
--hash=sha256:69a79e083a716173e5532e0fa3bef45f793f4e61096cf52b5a42c0211c8b8aa5 \
9+
--hash=sha256:c2abcdfe1be8ace47ba777d4fce319eb13bf8ad9dace8d085dcad6eded88057f
1010
# via nox
1111
colorlog==6.8.2 \
1212
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
@@ -16,23 +16,27 @@ distlib==0.3.8 \
1616
--hash=sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 \
1717
--hash=sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64
1818
# via virtualenv
19-
filelock==3.13.1 \
20-
--hash=sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e \
21-
--hash=sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c
19+
filelock==3.15.4 \
20+
--hash=sha256:2207938cbc1844345cb01a5a95524dae30f0ce089eba5b00378295a17e3e90cb \
21+
--hash=sha256:6ca1fffae96225dab4c6eaf1c4f4f28cd2568d3ec2a44e15a08520504de468e7
2222
# via virtualenv
23-
nox==2024.3.2 \
24-
--hash=sha256:e53514173ac0b98dd47585096a55572fe504fecede58ced708979184d05440be \
25-
--hash=sha256:f521ae08a15adbf5e11f16cb34e8d0e6ea521e0b92868f684e91677deb974553
23+
nox==2024.4.15 \
24+
--hash=sha256:6492236efa15a460ecb98e7b67562a28b70da006ab0be164e8821177577c0565 \
25+
--hash=sha256:ecf6700199cdfa9e5ea0a41ff5e6ef4641d09508eda6edb89d9987864115817f
2626
# via -r requirements.in
27-
packaging==24.0 \
28-
--hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
29-
--hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
27+
packaging==24.1 \
28+
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
29+
--hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
3030
# via nox
31-
platformdirs==4.2.0 \
32-
--hash=sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068 \
33-
--hash=sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768
31+
platformdirs==4.2.2 \
32+
--hash=sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee \
33+
--hash=sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3
3434
# via virtualenv
35-
virtualenv==20.25.1 \
36-
--hash=sha256:961c026ac520bac5f69acb8ea063e8a4f071bcc9457b9c1f28f6b085c511583a \
37-
--hash=sha256:e08e13ecdca7a0bd53798f356d5831434afa5b07b93f0abdf0797b7a06ffe197
35+
tomli==2.0.1 \
36+
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
37+
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
38+
# via nox
39+
virtualenv==20.26.3 \
40+
--hash=sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a \
41+
--hash=sha256:8cc4a31139e796e9a7de2cd5cf2489de1217193116a8fd42328f1bd65f434589
3842
# via nox

‎.kokoro/populate-secrets.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2023 Google LLC.
2+
# Copyright 2024 Google LLC.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

‎.kokoro/publish-docs.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2023 Google LLC
2+
# Copyright 2024 Google LLC
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -21,42 +21,42 @@ export PYTHONUNBUFFERED=1
2121
export PATH="${HOME}/.local/bin:${PATH}"
2222

2323
# Install nox
24-
python3 -m pip install --require-hashes -r .kokoro/requirements.txt
25-
python3 -m nox --version
24+
python3.10 -m pip install --require-hashes -r .kokoro/requirements.txt
25+
python3.10 -m nox --version
2626

2727
# build docs
2828
nox -s docs
2929

3030
# create metadata
31-
python3 -m docuploader create-metadata \
31+
python3.10 -m docuploader create-metadata \
3232
--name=$(jq --raw-output '.name // empty' .repo-metadata.json) \
33-
--version=$(python3 setup.py --version) \
33+
--version=$(python3.10 setup.py --version) \
3434
--language=$(jq --raw-output '.language // empty' .repo-metadata.json) \
35-
--distribution-name=$(python3 setup.py --name) \
35+
--distribution-name=$(python3.10 setup.py --name) \
3636
--product-page=$(jq --raw-output '.product_documentation // empty' .repo-metadata.json) \
3737
--github-repository=$(jq --raw-output '.repo // empty' .repo-metadata.json) \
3838
--issue-tracker=$(jq --raw-output '.issue_tracker // empty' .repo-metadata.json)
3939

4040
cat docs.metadata
4141

4242
# upload docs
43-
python3 -m docuploader upload docs/_build/html --metadata-file docs.metadata --staging-bucket "${STAGING_BUCKET}"
43+
python3.10 -m docuploader upload docs/_build/html --metadata-file docs.metadata --staging-bucket "${STAGING_BUCKET}"
4444

4545

4646
# docfx yaml files
4747
nox -s docfx
4848

4949
# create metadata.
50-
python3 -m docuploader create-metadata \
50+
python3.10 -m docuploader create-metadata \
5151
--name=$(jq --raw-output '.name // empty' .repo-metadata.json) \
52-
--version=$(python3 setup.py --version) \
52+
--version=$(python3.10 setup.py --version) \
5353
--language=$(jq --raw-output '.language // empty' .repo-metadata.json) \
54-
--distribution-name=$(python3 setup.py --name) \
54+
--distribution-name=$(python3.10 setup.py --name) \
5555
--product-page=$(jq --raw-output '.product_documentation // empty' .repo-metadata.json) \
5656
--github-repository=$(jq --raw-output '.repo // empty' .repo-metadata.json) \
5757
--issue-tracker=$(jq --raw-output '.issue_tracker // empty' .repo-metadata.json)
5858

5959
cat docs.metadata
6060

6161
# upload docs
62-
python3 -m docuploader upload docs/_build/html/docfx_yaml --metadata-file docs.metadata --destination-prefix docfx --staging-bucket "${V2_STAGING_BUCKET}"
62+
python3.10 -m docuploader upload docs/_build/html/docfx_yaml --metadata-file docs.metadata --destination-prefix docfx --staging-bucket "${V2_STAGING_BUCKET}"

‎.kokoro/release.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2023 Google LLC
2+
# Copyright 2024 Google LLC
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /
2323
export PYTHONUNBUFFERED=1
2424

2525
# Move into the package, build the distribution and upload.
26-
TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-1")
26+
TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-2")
2727
cd github/python-bigquery-sqlalchemy
2828
python3 setup.py sdist bdist_wheel
2929
twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*

‎.kokoro/release/common.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ before_action {
2828
fetch_keystore {
2929
keystore_resource {
3030
keystore_config_id: 73713
31-
keyname: "google-cloud-pypi-token-keystore-1"
31+
keyname: "google-cloud-pypi-token-keystore-2"
3232
}
3333
}
3434
}

0 commit comments

Comments
 (0)