Skip to content

Commit

Permalink
revert changes that should be excluded by owlbot
Browse files Browse the repository at this point in the history
  • Loading branch information
dizcology committed Sep 7, 2023
1 parent b8c0a36 commit a7aff2c
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .kokoro/samples/python3.10/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env_vars: {
# Declare build specific Cloud project.
env_vars: {
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
value: "python-docs-samples-tests-310"
value: "ucaip-sample-tests"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/samples/python3.11/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env_vars: {
# Declare build specific Cloud project.
env_vars: {
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
value: "python-docs-samples-tests-311"
value: "ucaip-sample-tests"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/samples/python3.7/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env_vars: {
# Declare build specific Cloud project.
env_vars: {
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
value: "python-docs-samples-tests-py37"
value: "ucaip-sample-tests"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/samples/python3.7/periodic.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

env_vars: {
key: "INSTALL_LIBRARY_FROM_SOURCE"
value: "False"
value: "True"
}
2 changes: 1 addition & 1 deletion .kokoro/samples/python3.8/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env_vars: {
# Declare build specific Cloud project.
env_vars: {
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
value: "python-docs-samples-tests-py38"
value: "ucaip-sample-tests"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/samples/python3.9/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env_vars: {
# Declare build specific Cloud project.
env_vars: {
key: "BUILD_SPECIFIC_GCLOUD_PROJECT"
value: "python-docs-samples-tests-py39"
value: "ucaip-sample-tests"
}

env_vars: {
Expand Down
6 changes: 4 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

import nox

FLAKE8_VERSION = "flake8==6.1.0"
BLACK_VERSION = "black==22.3.0"
ISORT_VERSION = "isort==5.10.1"
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
Expand All @@ -47,7 +48,7 @@
]
UNIT_TEST_EXTRAS_BY_PYTHON = {}

SYSTEM_TEST_PYTHON_VERSIONS = ["3.8"]
SYSTEM_TEST_PYTHON_VERSIONS = ["3.11"]
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
Expand Down Expand Up @@ -85,10 +86,11 @@ def lint(session):
Returns a failure if the linters find linting errors or sufficiently
serious code quality issues.
"""
session.install("flake8", BLACK_VERSION)
session.install(FLAKE8_VERSION, BLACK_VERSION)
session.run(
"black",
"--check",
"--diff",
*LINT_PATHS,
)
session.run("flake8", "google", "tests")
Expand Down
10 changes: 7 additions & 3 deletions testing/constraints-3.10.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# -*- coding: utf-8 -*-
# This constraints file is required for unit tests.
# List all library dependencies and extras in this file.
google-api-core
proto-plus
protobuf
google-api-core==1.32.0
proto-plus==1.22.0
protobuf==3.19.5
mock==4.0.2
google-cloud-storage==2.0.0
packaging==20.0 # Increased for compatibility with MLFlow
grpcio-testing==1.34.0
2 changes: 2 additions & 0 deletions testing/constraints-3.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
google-api-core
proto-plus
protobuf
mock==4.0.2
google-cloud-storage==2.0.0
10 changes: 7 additions & 3 deletions testing/constraints-3.8.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# -*- coding: utf-8 -*-
# This constraints file is required for unit tests.
# List all library dependencies and extras in this file.
google-api-core
proto-plus
protobuf
google-api-core==1.32.0
proto-plus==1.22.0
protobuf==3.19.5
mock==4.0.2
google-cloud-storage==2.0.0
packaging==20.0 # Increased for compatibility with MLFlow
grpcio-testing==1.34.0
10 changes: 7 additions & 3 deletions testing/constraints-3.9.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# -*- coding: utf-8 -*-
# This constraints file is required for unit tests.
# List all library dependencies and extras in this file.
google-api-core
proto-plus
protobuf
google-api-core==1.32.0
proto-plus==1.22.0
protobuf==3.19.5
mock==4.0.2
google-cloud-storage==2.0.0
packaging==20.0 # Increased for compatibility with MLFlow
grpcio-testing==1.34.0

0 comments on commit a7aff2c

Please sign in to comment.