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

* jsonargparse 4.39 required for CLI, check at run-time

Signed-off-by: Adam J. Stewart <ajstewart426@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: adamjstewart

src/lightning/pytorch/cli.py

@@ -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

tests/tests_pytorch/test_cli.py

@@ -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
@@ -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):
@@ -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"]
@@ -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):

tests/tests_pytorch/utilities/test_imports.py

@@ -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",
         ),