Skip to content

Commit a0d0812

Browse files
authored
Merge branch 'main' into toran
2 parents 96e7289 + 5ed9cce commit a0d0812

File tree

298 files changed

+9623
-2556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+9623
-2556
lines changed

.coveragerc

-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,3 @@ exclude_lines =
1212
pragma: NO COVER
1313
# Ignore debug-only repr
1414
def __repr__
15-
# Ignore pkg_resources exceptions.
16-
# This is added at the module level as a safeguard for if someone
17-
# generates the code and tries to run it without pip installing. This
18-
# makes it virtually impossible to test properly.
19-
except pkg_resources.DistributionNotFound

.github/.OwlBot.lock.yaml

+3-3
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.
@@ -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:3e3800bb100af5d7f9e810d48212b37812c1856d20ffeafb99ebe66461b61fc7
17-
# created: 2023-08-02T10:53:29.114535628Z
16+
digest: sha256:a8a80fc6456e433df53fc2a0d72ca0345db0ddefb409f1b75b118dfd1babd952
17+
# created: 2024-03-15T16:25:47.905264637Z

.github/sync-repo-settings.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,17 @@ branchProtectionRules:
1111
requiredStatusCheckContexts:
1212
- 'Kokoro'
1313
- 'Kokoro snippets-3.8'
14+
- 'Kokoro snippets-3.12'
15+
- 'Kokoro system-3.8'
16+
- 'Kokoro system-3.12'
1417
- 'cla/google'
1518
- 'Samples - Lint'
1619
- 'Samples - Python 3.7'
1720
- 'Samples - Python 3.8'
21+
- 'Samples - Python 3.9'
22+
- 'Samples - Python 3.10'
23+
- 'Samples - Python 3.11'
24+
- 'Samples - Python 3.12'
1825
- pattern: v2
1926
requiresLinearHistory: true
2027
requiresCodeOwnerReviews: true

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ docs.metadata
5151

5252
# Virtual environment
5353
env/
54+
venv/
5455

5556
# Test logs
5657
coverage.xml

.kokoro/build.sh

-7
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
3333
# Setup project id.
3434
export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
3535

36-
# Remove old nox
37-
python3 -m pip uninstall --yes --quiet nox-automation
38-
39-
# Install nox
40-
python3 -m pip install --upgrade --quiet nox
41-
python3 -m nox --version
42-
4336
# If this is a continuous build, send the test log to the FlakyBot.
4437
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
4538
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then

.kokoro/continuous/prerelease-deps-3.11.cfg renamed to .kokoro/continuous/prerelease-deps-3.12.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Only run this nox session.
44
env_vars: {
55
key: "NOX_SESSION"
6-
value: "prerelease_deps-3.11"
6+
value: "prerelease_deps-3.12"
77
}

.kokoro/continuous/prerelease-deps-3.8.cfg

-7
This file was deleted.

.kokoro/docker/docs/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,8 @@ RUN wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
8080
# Test pip
8181
RUN python3 -m pip
8282

83+
# Install build requirements
84+
COPY requirements.txt /requirements.txt
85+
RUN python3 -m pip install --require-hashes -r requirements.txt
86+
8387
CMD ["python3.8"]

.kokoro/docker/docs/requirements.in

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nox

.kokoro/docker/docs/requirements.txt

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.9
3+
# by the following command:
4+
#
5+
# pip-compile --allow-unsafe --generate-hashes requirements.in
6+
#
7+
argcomplete==3.2.3 \
8+
--hash=sha256:bf7900329262e481be5a15f56f19736b376df6f82ed27576fa893652c5de6c23 \
9+
--hash=sha256:c12355e0494c76a2a7b73e3a59b09024ca0ba1e279fb9ed6c1b82d5b74b6a70c
10+
# via nox
11+
colorlog==6.8.2 \
12+
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
13+
--hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
14+
# via nox
15+
distlib==0.3.8 \
16+
--hash=sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784 \
17+
--hash=sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64
18+
# via virtualenv
19+
filelock==3.13.1 \
20+
--hash=sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e \
21+
--hash=sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c
22+
# via virtualenv
23+
nox==2024.3.2 \
24+
--hash=sha256:e53514173ac0b98dd47585096a55572fe504fecede58ced708979184d05440be \
25+
--hash=sha256:f521ae08a15adbf5e11f16cb34e8d0e6ea521e0b92868f684e91677deb974553
26+
# via -r requirements.in
27+
packaging==24.0 \
28+
--hash=sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5 \
29+
--hash=sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9
30+
# via nox
31+
platformdirs==4.2.0 \
32+
--hash=sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068 \
33+
--hash=sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768
34+
# via virtualenv
35+
virtualenv==20.25.1 \
36+
--hash=sha256:961c026ac520bac5f69acb8ea063e8a4f071bcc9457b9c1f28f6b085c511583a \
37+
--hash=sha256:e08e13ecdca7a0bd53798f356d5831434afa5b07b93f0abdf0797b7a06ffe197
38+
# via nox

.kokoro/presubmit/linting-typing.cfg

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Only run these nox sessions.
4+
env_vars: {
5+
key: "NOX_SESSION"
6+
value: "lint lint_setup_py blacken mypy mypy_samples pytype"
7+
}

.kokoro/presubmit/prerelease-deps-3.11.cfg

-7
This file was deleted.

.kokoro/presubmit/prerelease-deps-3.8.cfg

-7
This file was deleted.

.kokoro/presubmit/presubmit.cfg

+4
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ env_vars: {
99
key: "RUN_SNIPPETS_TESTS"
1010
value: "false"
1111
}
12+
env_vars: {
13+
key: "RUN_LINTING_TYPING_TESTS"
14+
value: "false"
15+
}

.kokoro/presubmit/snippets-3.11.cfg renamed to .kokoro/presubmit/snippets-3.12.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Only run this nox session.
44
env_vars: {
55
key: "NOX_SESSION"
6-
value: "snippets-3.11"
6+
value: "snippets-3.12"
77
}

.kokoro/presubmit/system-3.11.cfg renamed to .kokoro/presubmit/system-3.12.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Only run this nox session.
44
env_vars: {
55
key: "NOX_SESSION"
6-
value: "system-3.11"
6+
value: "system-3.12"
77
}

.kokoro/requirements.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
gcp-docuploader
2-
gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x
2+
gcp-releasetool>=2 # required for compatibility with cryptography>=42.x
33
importlib-metadata
44
typing-extensions
55
twine
@@ -8,3 +8,4 @@ setuptools
88
nox>=2022.11.21 # required to remove dependency on py
99
charset-normalizer<3
1010
click<8.1.0
11+
cryptography>=42.0.5

0 commit comments

Comments
 (0)