Skip to content

Commit d3f2f1e

Browse files
authored
Merge branch 'main' into fix-bq-storage-client-deadlock
2 parents 3f8bd10 + fef8b88 commit d3f2f1e

File tree

20 files changed

+417
-374
lines changed

20 files changed

+417
-374
lines changed

.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:e8dcfd7cbfd8beac3a3ff8d3f3185287ea0625d859168cc80faccfc9a7a00455
17-
# created: 2024-09-16T21:04:09.091105552Z
16+
digest: sha256:5cddfe2fb5019bbf78335bc55f15bc13e18354a56b3ff46e1834f8e540807f05
17+
# created: 2024-10-31T01:41:07.349286254Z

.github/release-trigger.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
enabled: true
2+
multiScmName:

.kokoro/docker/docs/requirements.txt

+21-21
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
44
#
55
# pip-compile --allow-unsafe --generate-hashes requirements.in
66
#
7-
argcomplete==3.4.0 \
8-
--hash=sha256:69a79e083a716173e5532e0fa3bef45f793f4e61096cf52b5a42c0211c8b8aa5 \
9-
--hash=sha256:c2abcdfe1be8ace47ba777d4fce319eb13bf8ad9dace8d085dcad6eded88057f
7+
argcomplete==3.5.1 \
8+
--hash=sha256:1a1d148bdaa3e3b93454900163403df41448a248af01b6e849edc5ac08e6c363 \
9+
--hash=sha256:eb1ee355aa2557bd3d0145de7b06b2a45b0ce461e1e7813f5d066039ab4177b4
1010
# via nox
1111
colorlog==6.8.2 \
1212
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
1313
--hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
1414
# via nox
15-
distlib==0.3.8 \
16-
--hash=sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 \
17-
--hash=sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64
15+
distlib==0.3.9 \
16+
--hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
17+
--hash=sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403
1818
# via virtualenv
19-
filelock==3.15.4 \
20-
--hash=sha256:2207938cbc1844345cb01a5a95524dae30f0ce089eba5b00378295a17e3e90cb \
21-
--hash=sha256:6ca1fffae96225dab4c6eaf1c4f4f28cd2568d3ec2a44e15a08520504de468e7
19+
filelock==3.16.1 \
20+
--hash=sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0 \
21+
--hash=sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435
2222
# via virtualenv
23-
nox==2024.4.15 \
24-
--hash=sha256:6492236efa15a460ecb98e7b67562a28b70da006ab0be164e8821177577c0565 \
25-
--hash=sha256:ecf6700199cdfa9e5ea0a41ff5e6ef4641d09508eda6edb89d9987864115817f
23+
nox==2024.10.9 \
24+
--hash=sha256:1d36f309a0a2a853e9bccb76bbef6bb118ba92fa92674d15604ca99adeb29eab \
25+
--hash=sha256:7aa9dc8d1c27e9f45ab046ffd1c3b2c4f7c91755304769df231308849ebded95
2626
# via -r requirements.in
2727
packaging==24.1 \
2828
--hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
2929
--hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
3030
# via nox
31-
platformdirs==4.2.2 \
32-
--hash=sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee \
33-
--hash=sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3
31+
platformdirs==4.3.6 \
32+
--hash=sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907 \
33+
--hash=sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb
3434
# via virtualenv
35-
tomli==2.0.1 \
36-
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
37-
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
35+
tomli==2.0.2 \
36+
--hash=sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38 \
37+
--hash=sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed
3838
# via nox
39-
virtualenv==20.26.3 \
40-
--hash=sha256:4c43a2a236279d9ea36a0d76f98d84bd6ca94ac4e0f4a3b9d46d05e10fea542a \
41-
--hash=sha256:8cc4a31139e796e9a7de2cd5cf2489de1217193116a8fd42328f1bd65f434589
39+
virtualenv==20.26.6 \
40+
--hash=sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48 \
41+
--hash=sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2
4242
# via nox

.kokoro/docs/common.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ before_action {
6363
keyname: "docuploader_service_account"
6464
}
6565
}
66-
}
66+
}

.kokoro/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -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-2")
26+
TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-3")
2727
cd github/python-bigquery
2828
python3 setup.py sdist bdist_wheel
2929
twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*

.kokoro/release/common.cfg

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

36-
# Tokens needed to report release status back to GitHub
37-
env_vars: {
38-
key: "SECRET_MANAGER_KEYS"
39-
value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
40-
}
41-
4236
# Store the packages we uploaded to PyPI. That way, we have a record of exactly
4337
# what we published, which we can use to generate SBOMs and attestations.
4438
action {

0 commit comments

Comments
 (0)