Skip to content

jsonargparse 4.39 required for CLI, check at run-time #21747

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.

Sign up for GitHub

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

Open
adamjstewart wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −9
Open

jsonargparse 4.39 required for CLI, check at run-time #21747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1021b10
jsonargparse 4.39 required for CLI, check at run-time
adamjstewart May 28, 2026
8d97792
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 28, 2026
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
2 changes: 1 addition & 1 deletion src/lightning/pytorch/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from lightning.pytorch.utilities.model_helpers import is_overridden
from lightning.pytorch.utilities.rank_zero import rank_zero_warn

_JSONARGPARSE_SIGNATURES_AVAILABLE = RequirementCache("jsonargparse[signatures]>=4.27.7")
_JSONARGPARSE_SIGNATURES_AVAILABLE = RequirementCache("jsonargparse[jsonnet,signatures]>=4.39")

if _JSONARGPARSE_SIGNATURES_AVAILABLE:
import docstring_parser
Expand Down
14 changes: 7 additions & 7 deletions tests/tests_pytorch/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import json
import operator
import os
import sys
from contextlib import ExitStack, contextmanager, redirect_stderr, redirect_stdout
from io import StringIO
from pathlib import Path
Expand Down Expand Up @@ -259,7 +258,9 @@ def test_lightning_cli_args(cleandir):
assert loaded_config["trainer"] == cli_config["trainer"]


@pytest.mark.skipif(compare_version("jsonargparse", operator.lt, "4.21.3"), reason="vulnerability with failing imports")
@pytest.mark.skipif(
compare_version("jsonargparse", operator.lt, "4.39"), reason="incompatibilities with older jsonargparse"
)
def test_lightning_env_parse(cleandir):
out = StringIO()
with mock.patch("sys.argv", ["", "fit", "--help"]), redirect_stdout(out), pytest.raises(SystemExit):
Expand Down Expand Up @@ -426,11 +427,8 @@ def any_model_any_data_cli():
LightningCLI(LightningModule, LightningDataModule, subclass_mode_model=True, subclass_mode_data=True)


@pytest.mark.skipif(compare_version("jsonargparse", operator.lt, "4.21.3"), reason="vulnerability with failing imports")
@pytest.mark.skipif(
(sys.version_info.major, sys.version_info.minor) == (3, 9)
and compare_version("jsonargparse", operator.lt, "4.24.0"),
reason="--trainer.precision is not parsed",
compare_version("jsonargparse", operator.lt, "4.39"), reason="incompatibilities with older jsonargparse"
)
def test_lightning_cli_help():
cli_args = ["any.py", "fit", "--help"]
Expand Down Expand Up @@ -1211,7 +1209,9 @@ def test_lightning_cli_subcommands():
assert e in parameters


@pytest.mark.skipif(compare_version("jsonargparse", operator.lt, "4.21.3"), reason="vulnerability with failing imports")
@pytest.mark.skipif(
compare_version("jsonargparse", operator.lt, "4.39"), reason="incompatibilities with older jsonargparse"
)
def test_lightning_cli_custom_subcommand():
class TestTrainer(Trainer):
def foo(self, model: LightningModule, x: int, y: float = 1.0):
Expand Down
2 changes: 1 addition & 1 deletion tests/tests_pytorch/utilities/test_imports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def clean_import():
),
pytest.param(
"lightning_utilities.core.imports.RequirementCache.__bool__",
_shortcut_patch(RequirementCache.__bool__, ("jsonargparse[signatures]>=4.12.0",), ("requirement",)),
_shortcut_patch(RequirementCache.__bool__, ("jsonargparse[jsonnet,signatures]>=4.39",), ("requirement",)),
"lightning.pytorch.cli",
id="cli",
),
Expand Down
Loading