Skip to content

Commit 9f0dda6

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
committed
🦉 Updates from OwlBot post-processor
See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
1 parent 101086e commit 9f0dda6

File tree

12 files changed

+291
-242
lines changed

12 files changed

+291
-242
lines changed

‎.kokoro/docker/docs/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ RUN apt-get update \
6060
&& rm -rf /var/lib/apt/lists/* \
6161
&& rm -f /var/cache/apt/archives/*.deb
6262

63-
###################### Install python 3.8.11
63+
###################### Install python 3.9.13
6464

65-
# Download python 3.8.11
66-
RUN wget https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tgz
65+
# Download python 3.9.13
66+
RUN wget https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tgz
6767

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

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

7575
###################### Install pip

‎.kokoro/requirements.in‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
gcp-docuploader
2-
gcp-releasetool
2+
gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x
33
importlib-metadata
44
typing-extensions
55
twine
66
wheel
77
setuptools
8-
nox
8+
nox>=2022.11.21 # required to remove dependency on py
9+
charset-normalizer<3
10+
click<8.1.0

‎.kokoro/requirements.txt‎

Lines changed: 194 additions & 173 deletions
Large diffs are not rendered by default.

‎.kokoro/samples/python3.11/common.cfg‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Build logs will be here
4+
action {
5+
define_artifacts {
6+
regex: "**/*sponge_log.xml"
7+
}
8+
}
9+
10+
# Specify which tests to run
11+
env_vars: {
12+
key: "RUN_TESTS_SESSION"
13+
value: "py-3.11"
14+
}
15+
16+
# Declare build specific Cloud project.
17+
env_vars: {
18+
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
19+
value: "ucaip-sample-tests"
20+
}
21+
22+
env_vars: {
23+
key: "TRAMPOLINE_BUILD_FILE"
24+
value: "github/python-aiplatform/.kokoro/test-samples.sh"
25+
}
26+
27+
# Configure the docker image for kokoro-trampoline.
28+
env_vars: {
29+
key: "TRAMPOLINE_IMAGE"
30+
value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
31+
}
32+
33+
# Download secrets for samples
34+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
35+
36+
# Download trampoline resources.
37+
gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
38+
39+
# Use the trampoline script to run in docker.
40+
build_file: "python-aiplatform/.kokoro/trampoline_v2.sh"

‎.kokoro/samples/python3.11/continuous.cfg‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
env_vars: {
4+
key: "INSTALL_LIBRARY_FROM_SOURCE"
5+
value: "True"
6+
}

‎.kokoro/samples/python3.11/periodic-head.cfg‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
env_vars: {
4+
key: "INSTALL_LIBRARY_FROM_SOURCE"
5+
value: "True"
6+
}
7+
8+
env_vars: {
9+
key: "TRAMPOLINE_BUILD_FILE"
10+
value: "github/python-aiplatform/.kokoro/test-samples-against-head.sh"
11+
}

‎.kokoro/samples/python3.11/periodic.cfg‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
env_vars: {
4+
key: "INSTALL_LIBRARY_FROM_SOURCE"
5+
value: "False"
6+
}

‎.kokoro/samples/python3.11/presubmit.cfg‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
env_vars: {
4+
key: "INSTALL_LIBRARY_FROM_SOURCE"
5+
value: "True"
6+
}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
rev: 22.3.0
2626
hooks:
2727
- id: black
28-
- repo: https://gitlab.com/pycqa/flake8
28+
- repo: https://github.com/pycqa/flake8
2929
rev: 3.9.2
3030
hooks:
3131
- id: flake8

‎noxfile.py‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ def unit(session):
191191
def install_systemtest_dependencies(session, *constraints):
192192

193193
# Use pre-release gRPC for system tests.
194-
# Exclude version 1.49.0rc1 which has a known issue.
195-
# See https://github.com/grpc/grpc/pull/30642
196-
session.install("--pre", "grpcio!=1.49.0rc1")
194+
# Exclude version 1.52.0rc1 which has a known issue.
195+
# See https://github.com/grpc/grpc/issues/32163
196+
session.install("--pre", "grpcio!=1.52.0rc1")
197197

198198
session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *constraints)
199199

@@ -275,7 +275,7 @@ def cover(session):
275275
session.run("coverage", "erase")
276276

277277

278-
@nox.session(python=DEFAULT_PYTHON_VERSION)
278+
@nox.session(python="3.9")
279279
def docs(session):
280280
"""Build the docs for this library."""
281281

@@ -301,17 +301,16 @@ def docs(session):
301301
)
302302

303303

304-
@nox.session(python=DEFAULT_PYTHON_VERSION)
304+
@nox.session(python="3.9")
305305
def docfx(session):
306306
"""Build the docfx yaml files for this library."""
307307

308308
session.install("-e", ".")
309309
session.install(
310-
"sphinx==4.0.1",
310+
"gcp-sphinx-docfx-yaml",
311311
"alabaster",
312312
"google-cloud-aiplatform[prediction]",
313313
"recommonmark",
314-
"gcp-sphinx-docfx-yaml",
315314
)
316315

317316
shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
@@ -349,9 +348,7 @@ def prerelease_deps(session):
349348
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
350349
session.install(*unit_deps_all)
351350
system_deps_all = (
352-
SYSTEM_TEST_STANDARD_DEPENDENCIES
353-
+ SYSTEM_TEST_EXTERNAL_DEPENDENCIES
354-
+ SYSTEM_TEST_EXTRAS
351+
SYSTEM_TEST_STANDARD_DEPENDENCIES + SYSTEM_TEST_EXTERNAL_DEPENDENCIES
355352
)
356353
session.install(*system_deps_all)
357354

@@ -381,8 +378,8 @@ def prerelease_deps(session):
381378
# dependency of grpc
382379
"six",
383380
"googleapis-common-protos",
384-
# Exclude version 1.49.0rc1 which has a known issue. See https://github.com/grpc/grpc/pull/30642
385-
"grpcio!=1.49.0rc1",
381+
# Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163
382+
"grpcio!=1.52.0rc1",
386383
"grpcio-status",
387384
"google-api-core",
388385
"proto-plus",

0 commit comments

Comments
 (0)