dynaconf 3.3.1__tar.gz → 3.3.2__tar.gz

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

@@ -2,6 +2,31 @@ 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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynaconf
-Version: 3.3.1
+Version: 3.3.2
 Summary: The dynamic configurator for your Python Project
 Author-email: Bruno Rocha <rochacbruno@gmail.com>
 License: MIT

dynaconf-3.3.2/dynaconf/VERSION

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

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

@@ -880,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]

{dynaconf-3.3.1 → 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.1 → dynaconf-3.3.2}/dynaconf/utils/__init__.py

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

{dynaconf-3.3.1 → 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.1 → dynaconf-3.3.2}/dynaconf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynaconf
-Version: 3.3.1
+Version: 3.3.2
 Summary: The dynamic configurator for your Python Project
 Author-email: Bruno Rocha <rochacbruno@gmail.com>
 License: MIT

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

@@ -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.1"
+current_version = "3.3.2"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.
@@ -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 }

{dynaconf-3.3.1 → dynaconf-3.3.2}/tests/test_cli.py

@@ -465,48 +465,86 @@ host = "test.com"
 """
 
 
-def test_validate(tmpdir):
-    validation_file = tmpdir.join("dynaconf_validators.toml")
-    validation_file.write(VALIDATION)
+class TestValidate:
+    def _run_validate(
+        self,
+        *,
+        settings_mod: str,
+        validation_file: str,
+        env: dict | None = None,
+    ) -> str:
+        return run(
+            ["-i", settings_mod, "validate", "-p", validation_file], env
+        )
 
-    toml_valid = tmpdir.mkdir("valid").join("settings.toml")
-    toml_valid.write(TOML_VALID)
+    def test_basic(self, create_file):
+        validators_toml = create_file("dynaconf_validators.toml", VALIDATION)
+        toml_valid = create_file("settings_valid.toml", TOML_VALID)
+        toml_invalid = create_file("settings_invalid.toml", TOML_INVALID)
 
-    toml_invalid = tmpdir.mkdir("invalid").join("settings.toml")
-    toml_invalid.write(TOML_INVALID)
+        result = self._run_validate(
+            settings_mod="tests.config.settingsenv",
+            validation_file=str(validators_toml),
+            env={"SETTINGS_FILE_FOR_DYNACONF": str(toml_valid)},
+        )
+        assert "Validation success!" in result
 
-    result = run(
-        [
-            "-i",
-            "tests.config.settingsenv",
-            "validate",
-            "-p",
-            str(validation_file),
-        ],
-        {"SETTINGS_FILE_FOR_DYNACONF": str(toml_valid)},
-    )
-    assert "Validation success!" in result
+        result = self._run_validate(
+            settings_mod="tests.test_cli.settings",
+            validation_file=str(validators_toml.parent),
+            env={"SETTINGS_FILE_FOR_DYNACONF": str(toml_invalid)},
+        )
+        assert "age must lte 30 but it is 35 in env default" in result
+        assert (
+            "project must eq hello_world but it is This is not hello_world "
+            "in env production" in result
+        )
+        assert (
+            "host must is_not_in ['test.com'] but it is test.com in env "
+            "production" in result
+        )
+        assert "Validation success!" not in result
 
-    result = run(
+    @pytest.mark.parametrize(
+        "environments, expected",
         [
-            "-i",
-            "tests.test_cli.settings",
-            "validate",
-            "-p",
-            str(Path(str(validation_file)).parent),
+            pytest.param(True, "Validation error!", id="environments-enabled"),
+            pytest.param(
+                False, "Validation success!", id="environments-disabled"
+            ),
+            # In this last case, 'main' is considered a regular field, and it doesn't have
+            # a validator a must_exist rule. 'staryear' must exist, but if it's
+            # parent "main" (not an env here!) doesnt exist, which is fine, the
+            # validator doesn't apply. This is the most strict interpretation, and
+            # having the 'must_exist' rule propagate, that's it, require 'main' to exist,
+            # can be considered a new feature
         ],
-        {"SETTINGS_FILE_FOR_DYNACONF": str(toml_invalid)},
     )
-    assert "age must lte 30 but it is 35 in env default" in result
-    assert (
-        "project must eq hello_world but it is This is not hello_world "
-        "in env production" in result
-    )
-    assert (
-        "host must is_not_in ['test.com'] but it is test.com in env "
-        "production" in result
-    )
-    assert "Validation success!" not in result
+    def test_issue_1368(self, create_file, environments: bool, expected: str):
+        """Section-based validators in dynaconf_validators.toml with a non-default section name.
+
+        https://github.com/dynaconf/dynaconf/issues/1368
+        """
+        module = f"config_{environments}"
+        create_file(
+            f"{module}.py",
+            f"""
+            from dynaconf import Dynaconf
+            settings = Dynaconf(environments={environments})
+            """,
+        )
+        validators_toml = create_file(
+            "dynaconf_validators.toml",
+            """
+            [main]
+            startyear = {must_exist=true}
+            """,
+        )
+        result = self._run_validate(
+            settings_mod=f"{module}.settings",
+            validation_file=str(validators_toml),
+        )
+        assert expected in result
 
 
 def create_file(filename: str | Path, data: str):

{dynaconf-3.3.1 → dynaconf-3.3.2}/tests/test_utils.py

@@ -128,6 +128,39 @@ def test_casting_str(settings):
     assert isinstance(res, str) and res == "7"
 
 
+def test_string_starting_with_converter_prefix_is_not_cast(settings):
+    """A plain string that merely shares a prefix with a converter token
+    (e.g. ``@interface`` starts with ``@int``) must be kept verbatim, not
+    treated as a cast. Previously this raised ``KeyError``.
+    """
+    # these all start with a real converter token as a *prefix* only
+    for value in (
+        "@interface",  # @int
+        "@integer",  # @int
+        "@formatter",  # @format
+        "@gettext",  # @get
+        "@uppercase",  # @upper
+        "@stringify",  # @str
+        "@noneofthat",  # @none
+    ):
+        assert parse_conf_data(value, box_settings=settings) == value
+        assert (
+            parse_conf_data(value, tomlfy=True, box_settings=settings) == value
+        )
+
+    # a prefix collision followed by more words must also pass through
+    assert (
+        parse_conf_data("@formatter blah", tomlfy=True, box_settings=settings)
+        == "@formatter blah"
+    )
+
+    # real converter tokens must still cast (regression guard)
+    assert parse_conf_data("@int 5", box_settings=settings) == 5
+    assert parse_conf_data("@none", box_settings=settings) is None
+    settings.set("value", 5)
+    assert parse_conf_data("@int @format {this.value}")(settings) == 5
+
+
 def test_casting_int(settings):
     res = parse_conf_data("@int 2")
     assert isinstance(res, int) and res == 2
@@ -334,6 +367,22 @@ def test_merge_dict_with_meta_values(settings):
     assert new == {"A": 1, "C": 4}
 
 
+def test_merge_list_token_when_key_absent_in_old():
+    # A list carrying the `dynaconf_merge` marker must not crash when the key
+    # holding it is absent from the existing data (there is nothing to merge
+    # into).  The marker is consumed and the provided list is kept as-is.
+    old = {"existing": 1}
+    new = {"ports": [8080, "dynaconf_merge"]}
+    object_merge(old, new)
+    assert new == {"existing": 1, "ports": [8080]}
+
+    # Same for the `dynaconf_merge_unique` marker.
+    old = {"existing": 1}
+    new = {"ports": [8080, "dynaconf_merge_unique"]}
+    object_merge(old, new)
+    assert new == {"existing": 1, "ports": [8080]}
+
+
 def test_trimmed_split():
     # No sep
     assert trimmed_split("hello") == ["hello"]

{dynaconf-3.3.1 → dynaconf-3.3.2}/tests/test_validators.py

@@ -921,3 +921,19 @@ def test_validation_after_setenv_or_from_env(tmp_path):
     with pytest.raises(ValidationError):
         other_settings = settings.from_env("production")
         other_settings.validators.validate_all()
+
+
+def test_from_env_with_validate_on_update_does_not_recurse():
+    """from_env must not infinitely recurse via current_env -> validation."""
+    from dynaconf import Dynaconf
+    from dynaconf import Validator
+
+    settings = Dynaconf(
+        environments=True,
+        validate_on_update=True,
+        validators=[Validator("FOO", default="bar")],
+    )
+
+    # Before the fix this raised RecursionError.
+    other_settings = settings.from_env("development")
+    assert other_settings.current_env.lower() == "development"

dynaconf-3.3.1/dynaconf/VERSION

@@ -1 +0,0 @@
-3.3.1