Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: edit presubmit for to simplify configuration #1915

Merged
merged 18 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .kokoro/presubmit/presubmit-2.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Only run these nox sessions.
env_vars: {
key: "NOX_SESSION"
value: "unit_noextras unit cover docs"
}
27 changes: 3 additions & 24 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
"docs",
]

import time
from functools import wraps

chalmerlowe marked this conversation as resolved.
Show resolved Hide resolved

def default(session, install_extras=True):
"""Default unit test session.
Expand Down Expand Up @@ -132,10 +135,6 @@ def unit_noextras(session):
def mypy(session):
"""Run type checks with mypy."""

# Check the value of `RUN_LINTING_TYPING_TESTS` env var. It defaults to true.
if os.environ.get("RUN_LINTING_TYPING_TESTS", "true") == "false":
session.skip("RUN_LINTING_TYPING_TESTS is set to false, skipping")

session.install("-e", ".[all]")
session.install(MYPY_VERSION)

Expand All @@ -157,10 +156,6 @@ def pytype(session):
# recent version avoids the error until a possibly better fix is found.
# https://github.com/googleapis/python-bigquery/issues/655

# Check the value of `RUN_LINTING_TYPING_TESTS` env var. It defaults to true.
if os.environ.get("RUN_LINTING_TYPING_TESTS", "true") == "false":
session.skip("RUN_LINTING_TYPING_TESTS is set to false, skipping")

session.install("attrs==20.3.0")
session.install("-e", ".[all]")
session.install(PYTYPE_VERSION)
Expand Down Expand Up @@ -224,10 +219,6 @@ def system(session):
def mypy_samples(session):
"""Run type checks with mypy."""

# Check the value of `RUN_LINTING_TYPING_TESTS` env var. It defaults to true.
if os.environ.get("RUN_LINTING_TYPING_TESTS", "true") == "false":
session.skip("RUN_LINTING_TYPING_TESTS is set to false, skipping")

session.install("pytest")
for requirements_path in CURRENT_DIRECTORY.glob("samples/*/requirements.txt"):
session.install("-r", str(requirements_path))
Expand Down Expand Up @@ -409,10 +400,6 @@ def lint(session):
serious code quality issues.
"""

# Check the value of `RUN_LINTING_TYPING_TESTS` env var. It defaults to true.
if os.environ.get("RUN_LINTING_TYPING_TESTS", "true") == "false":
session.skip("RUN_LINTING_TYPING_TESTS is set to false, skipping")

session.install("flake8", BLACK_VERSION)
session.install("-e", ".")
session.run("flake8", os.path.join("google", "cloud", "bigquery"))
Expand All @@ -427,10 +414,6 @@ def lint(session):
def lint_setup_py(session):
"""Verify that setup.py is valid (including RST check)."""

# Check the value of `RUN_LINTING_TYPING_TESTS` env var. It defaults to true.
if os.environ.get("RUN_LINTING_TYPING_TESTS", "true") == "false":
session.skip("RUN_LINTING_TYPING_TESTS is set to false, skipping")

session.install("docutils", "Pygments")
session.run("python", "setup.py", "check", "--restructuredtext", "--strict")

Expand All @@ -441,10 +424,6 @@ def blacken(session):
Format code to uniform standard.
"""

# Check the value of `RUN_LINTING_TYPING_TESTS` env var. It defaults to true.
if os.environ.get("RUN_LINTING_TYPING_TESTS", "true") == "false":
session.skip("RUN_LINTING_TYPING_TESTS is set to false, skipping")

session.install(BLACK_VERSION)
session.run("black", *BLACK_PATHS)

Expand Down