From e6f8b81e1992a13ef30c5a4e9e3b962518ee7be7 Mon Sep 17 00:00:00 2001 From: David Leong <116610336+leongdl@users.noreply.github.com> Date: Wed, 1 Jul 2026 18:02:35 -0700 Subject: [PATCH] chore(deps): combine and fix up dependabot bumps (black 26, mypy 2, pytest 9) Combines dependabot PRs #218, #219, #222: - black 25.* -> 26.* (#218) - mypy 1.19.* -> 2.1.* (#219) - pytest 8.4.* -> 9.1.* (#222) black 26, mypy 2, and pytest 9 all dropped Python 3.9 (require >=3.10). Pinned via environment markers so the 3.9 CI job installs the last 3.9-compatible versions while 3.10+ gets the upgraded majors. Applied black 26 reformatting (docstring blank-line rule); verified black 25 agrees with the reformatted tree. Verified: ruff, black, mypy 2.1.0, and 289 unit tests pass. Signed-off-by: David Leong <116610336+leongdl@users.noreply.github.com> --- .github/scripts/get_latest_changelog.py | 1 + hatch_version_hook.py | 1 - requirements-testing.txt | 9 ++++++--- src/openjd/__main__.py | 1 - src/openjd/cli/_create_argparser.py | 1 - test/openjd/cli/test_run_command.py | 1 - 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/scripts/get_latest_changelog.py b/.github/scripts/get_latest_changelog.py index 5616efb..2382f58 100644 --- a/.github/scripts/get_latest_changelog.py +++ b/.github/scripts/get_latest_changelog.py @@ -29,6 +29,7 @@ ``` """ + import re h2 = r"^##\s.*$" diff --git a/hatch_version_hook.py b/hatch_version_hook.py index d7024ea..222ef81 100644 --- a/hatch_version_hook.py +++ b/hatch_version_hook.py @@ -7,7 +7,6 @@ from hatchling.builders.hooks.plugin.interface import BuildHookInterface from typing import Any, Optional - _logger = logging.Logger(__name__, logging.INFO) _stdout_handler = logging.StreamHandler(sys.stdout) _stdout_handler.addFilter(lambda record: record.levelno <= logging.INFO) diff --git a/requirements-testing.txt b/requirements-testing.txt index 97116eb..fd78099 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -1,9 +1,12 @@ coverage[toml] == 7.* -pytest == 8.4.* +pytest == 9.1.*; python_version >= "3.10" +pytest == 8.4.*; python_version < "3.10" pytest-cov == 7.1.* pytest-timeout == 2.4.* pytest-xdist == 3.8.* types-PyYAML == 6.* -black == 25.* -mypy == 1.19.* +black == 26.*; python_version >= "3.10" +black == 25.*; python_version < "3.10" +mypy == 2.1.*; python_version >= "3.10" +mypy == 1.19.*; python_version < "3.10" ruff == 0.15.* diff --git a/src/openjd/__main__.py b/src/openjd/__main__.py index f777da6..33e32c6 100644 --- a/src/openjd/__main__.py +++ b/src/openjd/__main__.py @@ -2,5 +2,4 @@ from .cli._create_argparser import main - main() diff --git a/src/openjd/cli/_create_argparser.py b/src/openjd/cli/_create_argparser.py index bc92cf5..ad059a2 100644 --- a/src/openjd/cli/_create_argparser.py +++ b/src/openjd/cli/_create_argparser.py @@ -14,7 +14,6 @@ from ._run import populate_argparser as populate_run_subparser from ._schema import populate_argparser as populate_schema_subparser - # Our CLI subcommand construction requires that all leaf subcommands define a default # 'func' property which is a Callable[[],None] that implements the subcommand. # After parsing, we call that `func` argument of the resulting args object. diff --git a/test/openjd/cli/test_run_command.py b/test/openjd/cli/test_run_command.py index 7285328..df0d656 100644 --- a/test/openjd/cli/test_run_command.py +++ b/test/openjd/cli/test_run_command.py @@ -23,7 +23,6 @@ from openjd.cli._run._local_session._session_manager import LoggingTimestampFormat from openjd.sessions import LOG as SessionsLogger, PathMappingRule, PathFormat - PARAMETRIZE_CASES: tuple = ( pytest.param( "basic.yaml",