dynaconf 3.3.0__tar.gz → 3.3.2__tar.gz

{dynaconf-3.3.0 → dynaconf-3.3.2}/CHANGELOG.md

@@ -2,6 +2,47 @@ Changelog
 =========
 
 <!-- insertion marker -->
+## [3.3.2](https://github.com/dynaconf/dynaconf/releases/tag/3.3.2) - 2026-06-29
+
+### Bug Fixes
+
+
+- Don't treat a string sharing a converter prefix as a cast (#1412). By @sarathfrancis90.
+
+
+- Fixed 'dynaconf validate' edge cases with validation_file.toml (#1411). By @pedro-psb.
+
+
+- Avoid RecursionError in from_env with validate_on_update (#1409). By @Redbot.
+
+
+- Avoid crash merging a dynaconf_merge list into a missing key (#1410). By @sarathfrancis90.
+
+
+### Chore
+
+
+- Fix check-release command from release utility. By @pedro-psb.
+
+
+- Improve changelog generation output. By @pedro-psb.
+
+## [3.3.1](https://github.com/dynaconf/dynaconf/releases/tag/3.3.1) - 2026-06-26
+
+### Bug Fixes
+
+- Remove call to deprecated functions on public APIs (#1404). *By Pedro Brochado*.
+- Improve converage of DataList and DataDict (#1403). *By Pedro Brochado*.
+- support Python 3.14 Union type repr and dict iteration changes. *By Pedro Brochado*.
+- preserve nested dict key order when object_merge merges old into new. *By Vincent Gao*.
+- prevent RecursionError on dotted set with bracket in first segment. *By Sarath Francis*.
+
+### Chore
+
+- Remove support for EOL python 3.9 (#1396). *By Pedro Brochado*.
+- Add support for python 3.14. *By Pedro Brochado*.
+- bump version to 3.3.1-dev0. *By pedro-psb*.
+
 ## [3.3.0](https://github.com/dynaconf/dynaconf/releases/tag/3.3.0) - 2026-06-24
 
 ### Bug Fixes

{dynaconf-3.3.0 → dynaconf-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynaconf
-Version: 3.3.0
+Version: 3.3.2
 Summary: The dynamic configurator for your Python Project
 Author-email: Bruno Rocha <rochacbruno@gmail.com>
 License: MIT
@@ -16,15 +16,15 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Utilities
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <3.14,>=3.9
+Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: vendor_licenses/box-LICENSE.txt

dynaconf-3.3.2/dynaconf/VERSION

@@ -0,0 +1 @@
+3.3.2

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/base.py

@@ -7,6 +7,7 @@ import os
 import re
 import warnings
 from collections import defaultdict
+from collections.abc import Callable
 from contextlib import contextmanager
 from contextlib import suppress
 from dataclasses import dataclass
@@ -15,7 +16,6 @@ from functools import lru_cache
 from functools import wraps
 from pathlib import Path
 from typing import Any
-from typing import Callable
 from typing import Optional
 from typing import Union
 
@@ -40,6 +40,7 @@ from dynaconf.utils import missing
 from dynaconf.utils import normalize_kwargs
 from dynaconf.utils import object_merge
 from dynaconf.utils import RENAMED_VARS
+from dynaconf.utils import to_dict
 from dynaconf.utils import upperfy
 from dynaconf.utils.files import find_file
 from dynaconf.utils.files import glob
@@ -502,7 +503,7 @@ class Settings:
         """
         ctx_mgr = suppress() if env is None else self.using_env(env)
         with ctx_mgr:
-            data = self.store.to_dict().copy()
+            data = to_dict(self.store)
             # if not internal remove internal settings
             if not internal:
                 for name in UPPER_DEFAULT_SETTINGS:
@@ -787,7 +788,7 @@ class Settings:
             new_data.update(
                 {
                     key: value
-                    for key, value in self.store.to_dict().copy().items()
+                    for key, value in to_dict(self.store).items()
                     if key.isupper() and key not in RENAMED_VARS
                 }
             )
@@ -879,8 +880,9 @@ class Settings:
             return self.MAIN_ENV_FOR_DYNACONF.lower()
 
         if self.FORCE_ENV_FOR_DYNACONF is not None:
-            self.ENV_FOR_DYNACONF = self.FORCE_ENV_FOR_DYNACONF
-            return self.FORCE_ENV_FOR_DYNACONF
+            forced = self.FORCE_ENV_FOR_DYNACONF
+            self.set("ENV_FOR_DYNACONF", forced, validate=False)
+            return forced
 
         try:
             return self.loaded_envs[-1]
@@ -1107,11 +1109,17 @@ class Settings:
                 full_path=split_keys,
                 list_merge=list_merge,  # when to use deep / shallow replace?
             )
+        # `new_data` is keyed by the already-resolved top level key
+        # (`split_keys[0]`). With index merge disabled a bracket is a literal
+        # key, so that key can still contain `[` (e.g. `servers[0]`). Writing
+        # it with dotted_lookup on would route it back into `_dotted_set` and
+        # recurse forever, so set the resolved keys literally.
         self.update(
             data=new_data,
             tomlfy=tomlfy,
             validate=validate,
             tomlfy_filter=tomlfy_filter,
+            dotted_lookup=False,
             **kwargs,
         )
 
@@ -1194,10 +1202,15 @@ class Settings:
             tomlfy_filter=tomlfy_filter,
         )
 
-        # Fix for #869 - The call to getattr trigger early evaluation
-        existing = (
-            self.store.get(key, None) if not isinstance(parsed, Lazy) else None
-        )
+        # Fix for #869 - Evaluating an existing lazy value during set can
+        # fail before a complete replacement value is stored.
+        existing = None
+        if not isinstance(parsed, Lazy):
+            with suppress(AttributeError, KeyError):
+                if isinstance(self.store, DataDict):
+                    existing = self.store.get(key, bypass_eval=True)
+                else:
+                    existing = self.store.get(key)
 
         if getattr(parsed, "_dynaconf_insert", False):
             # `@insert` calls insert in a list by index

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/cli.py

@@ -820,9 +820,9 @@ def validate(path):  # pragma: no cover
         )
         sys.exit(1)
 
-    # guarantee there is an environment
     validation_data = {k.lower(): v for k, v in validation_data.items()}
-    if not validation_data.get("default"):
+    if not settings.ENVIRONMENTS_FOR_DYNACONF:
+        # flat file: top-level keys are field names, not environments
         validation_data = {"default": validation_data}
 
     success = True

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/hooking.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
 from enum import Enum
 from functools import wraps
 from typing import Any
-from typing import Callable
 
 from dynaconf.base import Settings
 from dynaconf.loaders.base import SourceMetadata

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/loaders/__init__.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 import importlib
 import os
+from collections.abc import Callable
 from contextlib import suppress
-from typing import Callable
 from typing import TYPE_CHECKING
 
 from dynaconf import constants as ct
@@ -17,6 +17,7 @@ from dynaconf.loaders.base import SourceMetadata
 from dynaconf.nodes import DataDict
 from dynaconf.utils import deduplicate
 from dynaconf.utils import ensure_a_list
+from dynaconf.utils import to_dict
 from dynaconf.utils.files import get_local_filename
 from dynaconf.utils.files import glob
 from dynaconf.utils.files import has_magic
@@ -443,7 +444,7 @@ def write(filename, data, env=None, merge=False):
     if not loader:
         raise OSError(f"{loader_name} cannot be found.")
 
-    data = DataDict(data, box_settings={}).to_dict()
+    data = to_dict(DataDict(data, box_settings={}))
     if loader is not py_loader and env and env not in data:
         data = {env: data}
 

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/nodes.py

@@ -53,12 +53,6 @@ class DataDict(dict):
         self.__meta__ = NodeMetadata(core=core)
         convert_containers(self, self.items(), core)
 
-    def update(self, data):
-        super().update(ensure_containers(data, self.__meta__.core))
-
-    def setdefault(self, k, v):
-        return super().setdefault(k, ensure_containers(v, self.__meta__.core))
-
     def copy(self, bypass_eval=False):
         if not bypass_eval:
             return self.__class__(
@@ -115,11 +109,10 @@ class DataDict(dict):
     def items(self, bypass_eval=False):
         if not bypass_eval:
             yield from super().items()
-        yield from ((k, self.get(k, bypass_eval=True)) for k in self.keys())
-
-    def __setitem__(self, k, v):
-        result = ensure_containers(v, self.__meta__.core)
-        super().__setitem__(k, result)
+        else:
+            yield from (
+                (k, self.get(k, bypass_eval=True)) for k in self.keys()
+            )
 
     def __setattr__(self, k, v):
         # NOTE: We shouldnt use setattr to store items. If an item was assigned with setatttr
@@ -178,15 +171,7 @@ class DataDict(dict):
         box_deprecation_warning(
             "to_dict", "DataDict", "Use dict(data_dict) instead."
         )  # pragma: nocover
-        out_dict = dict(self)
-        for k, v in out_dict.items():
-            if v is self:
-                out_dict[k] = out_dict
-            elif isinstance(v, DataDict):
-                out_dict[k] = v.to_dict()
-            elif isinstance(v, DataList):
-                out_dict[k] = v.to_list()
-        return out_dict
+        return ut.to_dict(self)
 
     def merge_update(self, __m=None, **kwargs):  # pragma: nocover
         """Merge update with another dict"""
@@ -407,40 +392,22 @@ class DataList(list):
     def copy(self):
         return DataList((x for x in self), core=self.__meta__.core)
 
-    def append(self, v):
-        super().append(ensure_containers(v, self.__meta__.core))
-
-    def insert(self, i, v):
-        super().insert(i, ensure_containers(v, self.__meta__.core))
-
-    def extend(self, data):
-        super().extend(ensure_containers(data, self.__meta__.core))
-
     def __getitem__(self, index):
         result = super().__getitem__(index)
         return recursively_evaluate_lazy_format(result, self.__meta__.core)
 
-    def __setitem__(self, k, v):
-        super().__setitem__(k, ensure_containers(v, self.__meta__.core))
-
-    def __add__(self, v):
-        super().__add__(ensure_containers(v, self.__meta__.core))
-
-    def __iadd__(self, v):
-        return super().__iadd__(ensure_containers(v, self.__meta__.core))
-
     def __repr__(self):
         # NOTE: debatable choice: same representation of list
         return f"{list(self)!r}"
 
-    # Box compatibility. Remove in 4.0
-
     def __copy__(self):  # pragma: nocover
-        box_deprecation_warning("__copy__", "DataList")
+        # Not part of the plain list API, but needed to propagate core.
+        # Consider removing in the future if we can
         return self.copy()
 
     def __deepcopy__(self, memo=None):  # pragma: nocover
-        box_deprecation_warning("__deepcopy__", "DataList")
+        # Not part of the plain list API, but needed to propagate core.
+        # Consider removing in the future if we can
         out = self.__class__(core=self.__meta__.core)
         memo = memo or {}
         memo[id(self)] = out
@@ -448,6 +415,8 @@ class DataList(list):
             out.append(copy.deepcopy(k, memo=memo))
         return out
 
+    # Box compatibility. Remove in 4.0
+
     def to_list(self):  # pragma: nocover
         """
         Turn the DataList and sub DataLists back into a native python list.
@@ -457,17 +426,8 @@ class DataList(list):
         box_deprecation_warning(
             "to_list", "DataList", "Use list(data_list) instead."
         )
-        new_list = []
-        for x in self:
-            if x is self:
-                new_list.append(new_list)
-            elif isinstance(x, DataDict):
-                new_list.append(x.to_dict())
-            elif isinstance(x, DataList):
-                new_list.append(x.to_list())
-            else:
-                new_list.append(x)
-        return new_list
+        # to_dict recursively converts to both dicts and lists
+        return ut.to_dict(self)
 
     def to_json(
         self,
@@ -800,18 +760,6 @@ def recursively_evaluate_lazy_format(value, settings):
     return value
 
 
-def ensure_containers(data, core):
-    # NOTE: this is to ensure that the nodes nested dict and lists are always
-    # converted to DataDict and DataList. However, that change is not compatible
-    # with what we had with DynaBox/BoxList. Leaving here for awareness.
-    #
-    # if data.__class__ is dict:
-    #     return DataDict(data, core=core)
-    # elif data.__class__ is list:
-    #     return DataList(data, core=core)
-    return data
-
-
 def box_deprecation_warning(
     method_name: str, class_name: str, alternative: Optional[str] = None
 ):

dynaconf-3.3.2/dynaconf/typed/compat.py

@@ -0,0 +1,7 @@
+from inspect import get_annotations
+from types import UnionType
+
+__all__ = [
+    "get_annotations",
+    "UnionType",
+]

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/typed/guards.py

@@ -88,7 +88,7 @@ def raise_for_optional_without_none(
 
 def raise_for_invalid_class_variable(cls):
     """typed.Dynaconf only allows typed variables or dynaconf_options attr"""
-    for name, value in vars(cls).items():
+    for name, value in list(vars(cls).items()):
         if (
             name.startswith(("_", "dynaconf_options"))
             or name in cls.__annotations__

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/typed/main.py

@@ -2,11 +2,9 @@ from __future__ import annotations
 
 # WARNING: remove the import above when debugging on Python 3.12
 # otherwise type annotations will be stringified.
-import sys
 from dataclasses import asdict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any
 from typing import cast
 
 from dynaconf.base import LazySettings
@@ -20,10 +18,7 @@ from . import types as ty
 from . import utils as ut
 from .compat import get_annotations
 
-if sys.version_info < (3, 10):
-    dclass_args: dict[str, Any] = {}
-else:
-    dclass_args = {"kw_only": True}
+dclass_args = {"kw_only": True}
 
 
 @dataclass(**dclass_args)

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/typed/types.py

@@ -1,5 +1,6 @@
 from __future__ import annotations  # WARNING: remove this when debugging
 
+from types import NoneType
 from typing import Annotated
 from typing import TypeVar
 from typing import Union
@@ -71,7 +72,6 @@ Str = str
 Int = int
 Float = float
 Bool = bool
-NoneType = type(None)  # python 3.9 doesn't have types.NoneType
 List = list
 Tuple = tuple
 Dict = dict

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/typed/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations  # WARNING: remove this when debugging
 
+from collections.abc import Callable
 from typing import Annotated
-from typing import Callable
 from typing import get_args
 from typing import get_origin
 from typing import Union

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/typed/validators.py

@@ -1,8 +1,8 @@
 from __future__ import annotations  # WARNING: remove this when debugging
 
+from collections.abc import Callable
 from collections.abc import Sequence
 from typing import Any
-from typing import Callable
 
 from dynaconf.utils.functional import Empty
 from dynaconf.utils.functional import empty

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/utils/__init__.py

@@ -141,6 +141,16 @@ def object_merge(
                         full_path=full_path[1:] if full_path else None,
                         list_merge=list_merge,
                     )
+
+            # Restore old key order: keys that exist in old keep old's
+            # relative order; keys that are new-only come last.
+            old_keys = list(safe_items(old))
+            old_key_set = {k for k, _ in old_keys}
+            new_only = [k for k in new if k not in old_key_set]
+            ordered = [k for k, _ in old_keys if k in new] + new_only
+            for k in ordered:
+                new[k] = new.pop(k)
+
         handle_metavalues(old, new, list_merge=list_merge)
 
     return new
@@ -227,7 +237,7 @@ def handle_metavalues(
                     value.remove("dynaconf_merge_unique")
                     unique = True
 
-                for item in old.get(key)[::-1]:
+                for item in (old.get(key) or [])[::-1]:
                     if unique and item in value:
                         continue
                     value.insert(0, item)
@@ -624,6 +634,15 @@ def prepare_json(data: Any) -> Any:
     return data
 
 
+def to_dict(obj: Any) -> Any:
+    """Recursively convert dict/list subclasses to plain Python types."""
+    if isinstance(obj, dict):
+        return {k: to_dict(obj[k]) for k in obj}
+    elif isinstance(obj, list):
+        return [to_dict(x) for x in obj]
+    return obj
+
+
 def container_items(container: dict | list):
     if isinstance(container, dict):
         return container.items()

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/utils/files.py

@@ -137,10 +137,11 @@ def glob(
 ):
     """Redefined std glob assuming some defaults.
     and fallback for diffente python versions."""
-    glob_args = {"recursive": recursive}
-    if sys.version_info >= (3, 10):
-        glob_args["root_dir"] = root_dir
-        glob_args["dir_fd"] = dir_fd
+    glob_args = {
+        "recursive": recursive,
+        "root_dir": root_dir,
+        "dir_fd": dir_fd,
+    }
     if sys.version_info >= (3, 11):
         glob_args["include_hidden"] = include_hidden
     return python_glob(pathname, **glob_args)

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/utils/inspect.py

@@ -4,13 +4,13 @@ from __future__ import annotations
 
 import json
 import sys
+from collections.abc import Callable
 from contextlib import suppress
 from functools import partial
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version
 from pathlib import PosixPath
 from typing import Any
-from typing import Callable
 from typing import Literal
 from typing import Protocol
 from typing import TextIO

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/utils/parse_conf.py

@@ -761,7 +761,7 @@ def _parse_conf_data(data, tomlfy=False, box_settings=None):
         castenabled
         and data
         and isinstance(data, str)
-        and data.startswith(tuple(converters.keys()))
+        and data.partition(" ")[0] in converters
     ):
         # Check combination token is used
         comb_token = re.match(

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/validator.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
 from collections import defaultdict
+from collections.abc import Callable
 from collections.abc import Sequence
 from contextlib import suppress
 from copy import deepcopy
 from itertools import chain
 from types import MappingProxyType
 from typing import Any
-from typing import Callable
 from typing import get_args
 from typing import TYPE_CHECKING
 

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf/validator_conditions.py

@@ -6,17 +6,11 @@ Implement basic assertions to be used in assertion action
 from __future__ import annotations
 
 import re
+from types import UnionType
 from typing import get_args
 from typing import get_origin
 from typing import Union
 
-# NOTE: Remove when dropping 3.9
-try:
-    from types import UnionType  # type: ignore
-except ImportError:
-    UnionType = Union  # type: ignore
-# /NOTE
-
 
 def eq(value, other) -> bool:
     """Equals"""

{dynaconf-3.3.0 → dynaconf-3.3.2}/dynaconf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynaconf
-Version: 3.3.0
+Version: 3.3.2
 Summary: The dynamic configurator for your Python Project
 Author-email: Bruno Rocha <rochacbruno@gmail.com>
 License: MIT
@@ -16,15 +16,15 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Utilities
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <3.14,>=3.9
+Requires-Python: <3.15,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: vendor_licenses/box-LICENSE.txt

{dynaconf-3.3.0 → dynaconf-3.3.2}/pyproject.toml

@@ -11,7 +11,7 @@ authors = [
     {name = "Bruno Rocha", email = "rochacbruno@gmail.com"},
 ]
 license = {text = "MIT"}
-requires-python = ">=3.9,<3.14"
+requires-python = ">=3.10,<3.15"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Framework :: Django",
@@ -23,11 +23,11 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Utilities",
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -101,7 +101,7 @@ ba = "ba"
 # ====
 
 [tool.ruff]
-target-version = "py39"
+target-version = "py310"
 line-length = 79
 exclude = ["dynaconf/vendor*"]
 
@@ -170,7 +170,6 @@ omit = [
 # ======
 
 [tool.pytest.ini_options]
-pythonpath = [".github/scripts"]
 markers = [
     "integration: marks tests as integration (deselect with '-m \"not integration\"')",
 ]
@@ -209,7 +208,7 @@ ignore_missing_imports = true
 # ===========
 
 [tool.bumpversion]
-current_version = "3.3.0"
+current_version = "3.3.2"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.
@@ -256,7 +255,7 @@ optional_value = "final"
 # ===
 
 [tool.tox]
-envlist = ["py39", "py310", "py311", "py312", "py313"]
+envlist = ["py310", "py311", "py312", "py313"]
 whitelist_externals = ["make"]
 
 [tool.tox.testenv]
@@ -311,6 +310,7 @@ lint = [
     "typos>=1.42.3",
 ]
 test = [
+    "dynaconf-release-utility",
     "boto3>=1.40.67",
     "commentjson>=0.9.0",
     "configobj>=5.0.9",
@@ -342,3 +342,6 @@ release = [
     "toml>=0.10.2",
     "twine>=6.2.0",
 ]
+
+[tool.uv.sources]
+dynaconf-release-utility = { path = ".github/scripts/", editable = true }