Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,26 @@ replacements:
"pytest-xdist",
]
count: 1
- paths: [
packages/google-cloud-firestore/noxfile.py
]
before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS ='
after: |-
RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"

LINT_PATHS =
count: 1
- paths: [
packages/google-cloud-firestore/noxfile.py
]
before: '"pytest",'
after: 'PYTEST_VERSION,'
count: 2
- paths: [
packages/google-cloud-firestore/noxfile.py
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,26 @@ replacements:
before: '\n "--check-untyped-defs",'
after: '\n # TODO(https://github.com/googleapis/google-cloud-python/issues/16083)\n # "--check-untyped-defs",'
count: 1
- paths: [
"packages/google-cloud-error-reporting/noxfile.py",
]
before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS ='
after: |-
RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"

LINT_PATHS =
count: 1
- paths: [
"packages/google-cloud-error-reporting/noxfile.py",
]
before: '"pytest",'
after: 'PYTEST_VERSION,'
count: 2
- paths: [
"packages/google-cloud-monitoring-dashboards/noxfile.py",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,26 @@ replacements:
"types",
)
count: 1
- paths: [
packages/google-cloud-logging/noxfile.py
]
before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS ='
after: |-
RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"

LINT_PATHS =
count: 1
- paths: [
packages/google-cloud-logging/noxfile.py
]
before: '"pytest",'
after: 'PYTEST_VERSION,'
count: 2
- paths: [
packages/google-cloud-logging/noxfile.py
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,24 @@ replacements:
"""Skipping until Pub/Sub migration is complete."""
session.skip("Skipping core_deps_from_source for google-cloud-pubsub.")
count: 1
- paths:
- "packages/google-cloud-pubsub/noxfile.py"
before: 'RUFF_VERSION = "ruff==0\.14\.14"\n\nLINT_PATHS ='
after: |-
RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"

LINT_PATHS =
count: 1
- paths:
- "packages/google-cloud-pubsub/noxfile.py"
before: '"pytest",'
after: 'PYTEST_VERSION,'
count: 2
- paths:
- "packages/google-cloud-pubsub/noxfile.py"
before: '"--cov=google",'
Expand Down
11 changes: 8 additions & 3 deletions packages/db-dtypes/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
BLACK_VERSION = "black[jupyter]==23.7.0"
RUFF_VERSION = "ruff==0.14.14"
ISORT_VERSION = "isort==5.11.0"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"
LINT_PATHS = ["docs", "db_dtypes", "tests", "noxfile.py", "setup.py"]

DEFAULT_PYTHON_VERSION = "3.14"
Expand All @@ -48,7 +53,7 @@
UNIT_TEST_STANDARD_DEPENDENCIES = [
"mock",
"asyncmock",
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-asyncio",
]
Expand All @@ -61,7 +66,7 @@
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"]
SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [
"mock",
"pytest",
PYTEST_VERSION,
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand Down Expand Up @@ -262,7 +267,7 @@ def prerelease(session, tests_path):
session.install(
"mock",
"asyncmock",
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-asyncio",
# tzdata is only needed for testing: pandas 3.0+ no longer installs
Expand Down
7 changes: 6 additions & 1 deletion packages/google-api-core/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
import nox

RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

ALL_PYTHON = ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"]
Expand Down Expand Up @@ -220,7 +225,7 @@ def default(
unittest.skip("The pre-release session cannot be run without grpc")

session.install(
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-mock",
"pytest-xdist",
Expand Down
9 changes: 7 additions & 2 deletions packages/google-auth-httplib2/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
BLACK_VERSION = "black[jupyter]==23.7.0"
RUFF_VERSION = "ruff==0.14.14"
ISORT_VERSION = "isort==5.11.0"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"
LINT_PATHS = ["docs", "google_auth_httplib2.py", "tests", "noxfile.py", "setup.py"]

DEFAULT_PYTHON_VERSION = "3.14"
Expand All @@ -44,7 +49,7 @@
UNIT_TEST_STANDARD_DEPENDENCIES = [
"mock",
"asyncmock",
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-asyncio",
]
Expand All @@ -60,7 +65,7 @@
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.10"]
SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [
"mock",
"pytest",
PYTEST_VERSION,
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand Down
11 changes: 8 additions & 3 deletions packages/google-cloud-core/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@

BLACK_VERSION = "black==23.7.0"
RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning (inherited via shared CI venvs)
# into an error. Remove once pytest 9.2+ deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"
BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

DEFAULT_PYTHON_VERSION = "3.14"
Expand Down Expand Up @@ -136,7 +141,7 @@ def default(session):
)

# Install all test dependencies, then install local packages in-place.
session.install("pytest", "pytest-cov", "-c", constraints_path)
session.install(PYTEST_VERSION, "pytest-cov", "-c", constraints_path)
session.install("-e", ".[grpc]", "-c", constraints_path)

# Run py.test against the unit tests.
Expand Down Expand Up @@ -275,7 +280,7 @@ def prerelease_deps(session, protobuf_implementation):
"""Run all tests with prerelease versions of dependencies installed."""

# Install all test dependencies, then install local packages in-place.
session.install("pytest", "pytest-cov")
session.install(PYTEST_VERSION, "pytest-cov")
session.install("-e", ".[grpc]")

# Because we test minimum dependency versions on the minimum Python
Expand Down Expand Up @@ -362,7 +367,7 @@ def core_deps_from_source(session, protobuf_implementation):
"""

# Install all test dependencies, then install local packages in-place.
session.install("pytest", "pytest-cov")
session.install(PYTEST_VERSION, "pytest-cov")
session.install("-e", ".[grpc]")

# Because we test minimum dependency versions on the minimum Python
Expand Down
9 changes: 7 additions & 2 deletions packages/google-cloud-dns/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
BLACK_VERSION = "black[jupyter]==23.7.0"
RUFF_VERSION = "ruff==0.14.14"
ISORT_VERSION = "isort==5.11.0"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

DEFAULT_PYTHON_VERSION = "3.14"
Expand All @@ -46,7 +51,7 @@
UNIT_TEST_STANDARD_DEPENDENCIES = [
"mock",
"asyncmock",
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-asyncio",
]
Expand All @@ -58,7 +63,7 @@

SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [
"mock",
"pytest",
PYTEST_VERSION,
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand Down
9 changes: 7 additions & 2 deletions packages/google-cloud-documentai-toolbox/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
BLACK_VERSION = "black[jupyter]==23.7.0"
RUFF_VERSION = "ruff==0.14.14"
ISORT_VERSION = "isort==5.11.0"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

DEFAULT_PYTHON_VERSION = "3.14"
Expand All @@ -47,7 +52,7 @@
UNIT_TEST_STANDARD_DEPENDENCIES = [
"mock",
"asyncmock",
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-asyncio",
]
Expand All @@ -60,7 +65,7 @@
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ["3.12"]
SYSTEM_TEST_STANDARD_DEPENDENCIES: List[str] = [
"mock",
"pytest",
PYTEST_VERSION,
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand Down
9 changes: 7 additions & 2 deletions packages/google-cloud-error-reporting/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
import nox

RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"

LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

Expand Down Expand Up @@ -66,7 +71,7 @@
UNIT_TEST_STANDARD_DEPENDENCIES = [
"mock",
"asyncmock",
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-asyncio",
]
Expand All @@ -79,7 +84,7 @@
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
PYTEST_VERSION,
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
Expand Down
9 changes: 7 additions & 2 deletions packages/google-cloud-firestore/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
import nox

RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"

LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

Expand Down Expand Up @@ -66,7 +71,7 @@
UNIT_TEST_STANDARD_DEPENDENCIES = [
"mock",
"asyncmock",
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-asyncio==0.21.2",
]
Expand All @@ -83,7 +88,7 @@
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
PYTEST_VERSION,
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [
"pytest-asyncio==0.21.2",
Expand Down
9 changes: 7 additions & 2 deletions packages/google-cloud-logging/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
import nox

RUFF_VERSION = "ruff==0.14.14"
# Temporarily pin pytest<9.2 because pytest 9.2.0 applies filterwarnings=error
# before pytest_configure hooks run, turning pytest-asyncio's unset
# asyncio_default_fixture_loop_scope warning into an error. Remove once
# pytest 9.2+ warning and fixture scope deprecations are resolved.
PYTEST_VERSION = "pytest<9.2"

LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]

Expand Down Expand Up @@ -66,7 +71,7 @@
UNIT_TEST_STANDARD_DEPENDENCIES = [
"mock",
"asyncmock",
"pytest",
PYTEST_VERSION,
"pytest-cov",
"pytest-asyncio",
]
Expand All @@ -83,7 +88,7 @@
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
"mock",
"pytest",
PYTEST_VERSION,
"google-cloud-testutils",
]
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = [
Expand Down
Loading
Loading