Merge branch 'main' into dev/scriptconfig_integration

Author: mauvilsa

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.31.0
+current_version = 4.32.1
 commit = True
 tag = True
 tag_name = v{new_version}

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ ci:
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v4.6.0
   hooks:
   - id: check-added-large-files
   - id: check-ast
@@ -24,12 +24,12 @@ repos:
     exclude: .bumpversion.cfg
 
 - repo: https://github.com/psf/black
-  rev: 24.3.0
+  rev: 24.8.0
   hooks:
   - id: black
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.3.7
+  rev: v0.5.7
   hooks:
   - id: ruff
     args: ["--fix"]
@@ -40,14 +40,14 @@ repos:
   - id: yesqa
 
 - repo: https://github.com/crate-ci/typos
-  rev: v1.20.7
+  rev: v1.23.6
   hooks:
   - id: typos
     args: []
     verbose: true
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.9.0
+  rev: v1.11.1
   hooks:
   - id: mypy
     files: jsonargparse.*/.*.py
@@ -88,7 +88,7 @@ repos:
         if [ "$CHANGELOG" != "$EXPECTED" ] && [ $(echo $BUMPVERSION_NEW_VERSION | grep -cE "[0-9.]+(\.dev|rc)[0-9]+") = 0 ]; then
           if [ $(grep -c "^v$BUMPVERSION_NEW_VERSION " CHANGELOG.rst) = 1 ]; then
             echo "Updating the date for v$BUMPVERSION_NEW_VERSION in CHANGELOG.rst";
-            sed -ir "s|^v$BUMPVERSION_NEW_VERSION .*|$EXPECTED|" CHANGELOG.rst;
+            sed -i "s|^v$BUMPVERSION_NEW_VERSION .*|$EXPECTED|" CHANGELOG.rst;
             git add CHANGELOG.rst;
           else
             echo "Expected release in CHANGELOG.rst to be "$EXPECTED" or not have a definitive date.";
@@ -117,7 +117,7 @@ repos:
       trap cleanup EXIT;
       cp jsonargparse_tests/*.py "$TEST_DIR";
       cd "$TEST_DIR";
-      sed -ir "/^from __future__ import annotations$/d" *.py;
+      sed -i "/^from __future__ import annotations$/d" *.py;
       pytest $TEST_DIR;'
     stages: [pre-push]
     language: system
@@ -137,9 +137,9 @@ repos:
       cd "$TEST_DIR";
       pip install "pydantic<2";
       pytest test_dataclass_like.py;
-      sed -ir "s|import pydantic|import pydantic.v1 as pydantic|" test_dataclass_like.py;
-      sed -ir "s|^annotated = .*|annotated = False|" test_dataclass_like.py;
-      sed -ir "s|test_pydantic_types|_test_pydantic_types|" test_dataclass_like.py;
+      sed -i "s|import pydantic|import pydantic.v1 as pydantic|" test_dataclass_like.py;
+      sed -i "s|^annotated = .*|annotated = False|" test_dataclass_like.py;
+      sed -i "s|test_pydantic_types|_test_pydantic_types|" test_dataclass_like.py;
       pip install "pydantic>=2";
       pytest test_dataclass_like.py;'
     stages: [pre-push]

.sonarcloud.properties

@@ -1,3 +1,3 @@
 sonar.sources=jsonargparse
-sonar.projectVersion=4.31.0
+sonar.projectVersion=4.32.1
 sonar.python.version=3.7, 3.8, 3.9, 3.10, 3.11, 3.12

CHANGELOG.rst

@@ -12,13 +12,58 @@ The semantic versioning only considers the public API as described in
 paths are considered internals and can change in minor and patch releases.
 
 
-v4.32.0 (2024-07-??)
+v4.32.1 (2024-08-23)
+--------------------
+
+Fixed
+^^^^^
+- ``dict`` types not correctly forwarding previous nested values when parsing
+  (`#559 <https://github.com/omni-us/jsonargparse/pull/559>`__).
+- ``List`` type incorrectly using defaults from previous item (`#560
+  <https://github.com/omni-us/jsonargparse/pull/560>`__).
+- ``--print_shtab`` not adding file completer for ``_ActionConfigLoad`` (`#562
+  <https://github.com/omni-us/jsonargparse/pull/562>`__).
+- ``parser_mode`` not inherited by nested parsers (`#564
+  <https://github.com/omni-us/jsonargparse/pull/564>`__).
+
+
+v4.32.0 (2024-07-19)
 --------------------
 
 Added
 ^^^^^
 - Support for ``MappingProxyType`` as a type and as default for mapping types
   (`#540 <https://github.com/omni-us/jsonargparse/pull/540>`__).
+- Support for ``OrderedDict`` as a type (`#545
+  <https://github.com/omni-us/jsonargparse/pull/545>`__).
+- New function ``get_loader`` to get the current loader for a given parser mode
+  (`#479 comment
+  <https://github.com/omni-us/jsonargparse/issues/479#issuecomment-2022596544>`__,
+  `#536 comment
+  <https://github.com/omni-us/jsonargparse/issues/536#issuecomment-2186961644>`__).
+
+Fixed
+^^^^^
+- ``dump`` failing when a link target requires serialization and
+  ``skip_link_targets=False`` (`#542
+  <https://github.com/omni-us/jsonargparse/pull/542>`__).
+- ``default_config_files`` making parse fail for subcommands and nested subclass
+  types (`lightning-forums#5963
+  <https://lightning.ai/forums/t/problem-lightningcli-with-default-config-files/5963>`__).
+- Fixes related to transformers ``PreTrainedModel.from_pretrained``
+  (`lightning#19863 comment
+  <https://github.com/Lightning-AI/pytorch-lightning/discussions/19863#discussioncomment-9821765>`__):
+
+    - Import path of inherited classmethod not resolving correctly (`#548
+      <https://github.com/omni-us/jsonargparse/pull/548>`__).
+    - Resolved parameters leading to multiple values for keyword argument (`#551
+      <https://github.com/omni-us/jsonargparse/pull/551>`__).
+    - Function with return type a class in ``class_path`` in some cases fails
+      with unexpected ``instantiate`` parameter error (`#551
+      <https://github.com/omni-us/jsonargparse/pull/551>`__).
+    - Ignore incorrectly resolved ``config_file_name`` parameter for
+      transformers model ``from_pretrained``(`#551
+      <https://github.com/omni-us/jsonargparse/pull/551>`__).
 
 
 v4.31.0 (2024-06-27)

DOCUMENTATION.rst

@@ -400,9 +400,9 @@ Some notes about this support are:
   :ref:`restricted-strings` and paths and URLs as explained in sections
   :ref:`parsing-paths` and :ref:`parsing-urls`.
 
-- ``Dict``, ``Mapping``, ``MutableMapping``, ``MappingProxyType``, and
-  ``TypedDict`` are supported but only with ``str`` or ``int`` keys. For more
-  details see :ref:`dict-items`.
+- ``Dict``, ``Mapping``, ``MutableMapping``, ``MappingProxyType``,
+  ``OrderedDict`` and ``TypedDict`` are supported but only with ``str`` or
+  ``int`` keys. For more details see :ref:`dict-items`.
 
 - ``Tuple``, ``Set`` and ``MutableSet`` are supported even though they can't be
   represented in json distinguishable from a list. Each ``Tuple`` element

jsonargparse/__init__.py

@@ -70,4 +70,4 @@
 __all__ += _deprecated.__all__
 
 
-__version__ = "4.31.0"
+__version__ = "4.32.1"

jsonargparse/_actions.py

@@ -580,12 +580,12 @@ def add_prefix(key):
 @contextmanager
 def parent_parsers_context(key, parser):
     prev = parent_parsers.get()
-    curr = prev + [(key, parser)]
-    t = parent_parsers.set(curr)
+    curr = [] if parser is None else prev + [(key, parser)]
+    token = parent_parsers.set(curr)
     try:
         yield
     finally:
-        parent_parsers.reset(t)
+        parent_parsers.reset(token)
 
 
 class _ActionSubCommands(_SubParsersAction):

jsonargparse/_completions.py

@@ -12,7 +12,7 @@
 from subprocess import PIPE, Popen
 from typing import List, Union
 
-from ._actions import ActionConfigFile, _ActionHelpClassPath, remove_actions
+from ._actions import ActionConfigFile, _ActionConfigLoad, _ActionHelpClassPath, remove_actions
 from ._parameter_resolvers import get_signature_parameters
 from ._typehints import (
     ActionTypeHint,
@@ -142,7 +142,7 @@ def shtab_prepare_action(action, parser) -> None:
         return
 
     complete = None
-    if isinstance(action, ActionConfigFile):
+    if isinstance(action, (ActionConfigFile, _ActionConfigLoad)):
         complete = shtab.FILE
     elif isinstance(action, ActionTypeHint):
         typehint = action._typehint

jsonargparse/_core.py

@@ -754,7 +754,9 @@ def _dump_cleanup_actions(self, cfg, actions, dump_kwargs, prefix=""):
                 cfg.pop(action_dest, None)
                 for key, subparser in action.choices.items():
                     self._dump_cleanup_actions(cfg, subparser._actions, dump_kwargs, prefix=prefix + key + ".")
-            elif isinstance(action, ActionTypeHint):
+            elif isinstance(action, ActionLink):
+                action = action.target[1]
+            if isinstance(action, ActionTypeHint):
                 value = cfg.get(action_dest)
                 if value is not None:
                     with parser_context(parent_parser=self):

jsonargparse/_loaders_dumpers.py

@@ -11,6 +11,7 @@
 from ._type_checking import ArgumentParser
 
 __all__ = [
+    "get_loader",
     "set_loader",
     "set_dumper",
 ]
@@ -202,6 +203,11 @@ def set_loader(mode: str, loader_fn: Callable[[str], Any], exceptions: Tuple[Typ
     loader_exceptions[mode] = exceptions
 
 
+def get_loader(mode: str):
+    """Returns the current loader function for a given mode."""
+    return loaders[mode]
+
+
 def set_dumper(format_name: str, dumper_fn: Callable[[Any], str]):
     """Sets the dumping function for a given format name.