tomlkit 0.15.0

Author: dimbleby

poetry.lock

@@ -21,7 +21,7 @@ dependencies = [
     "requests-toolbelt (>=1.0.0,<2.0.0)",
     "shellingham (>=1.5,<2.0)",
     "tomli (>=2.0.1,<3.0.0) ; python_version < '3.11'",
-    "tomlkit (>=0.11.4,<1.0.0)",
+    "tomlkit (>=0.15.0,<1.0.0)",
     # trove-classifiers uses calver, so version is unclamped
     "trove-classifiers (>=2022.5.19)",
     "virtualenv (>=20.26.6)",

pyproject.toml

@@ -48,8 +48,7 @@ def get_property(self, key: str | Sequence[str]) -> Any:
             config = config[sub_key]
 
     def add_property(self, key: str | Sequence[str], value: Any) -> None:
-        with self.secure() as toml:
-            config: dict[str, Any] = toml
+        with self.secure() as config:
             keys = split_key(key)
 
             for i, sub_key in enumerate(keys):
@@ -63,8 +62,7 @@ def add_property(self, key: str | Sequence[str], value: Any) -> None:
                 config = config[sub_key]
 
     def remove_property(self, key: str | Sequence[str]) -> None:
-        with self.secure() as toml:
-            config: dict[str, Any] = toml
+        with self.secure() as config:
             keys = split_key(key)
 
             # Descend to the leaf, recording the (parent, key) at each step.

src/poetry/config/file_config_source.py

@@ -12,7 +12,6 @@
 from packaging.utils import canonicalize_name
 from poetry.core.packages.dependency import Dependency
 from poetry.core.packages.dependency_group import MAIN_GROUP
-from tomlkit.toml_document import TOMLDocument
 
 from poetry.console.commands.init import InitCommand
 from poetry.console.commands.installer_command import InstallerCommand
@@ -148,9 +147,7 @@ def handle(self) -> int:
         if optional and group != MAIN_GROUP:
             raise ValueError("You can only add optional dependencies to the main group")
 
-        # tomlkit types are awkward to work with, treat content as a mostly untyped
-        # dictionary.
-        content: dict[str, Any] = self.poetry.file.read()
+        content = self.poetry.file.read()
         project_content = content.get("project", table())
         poetry_content = content.get("tool", {}).get("poetry", table())
         groups_content = content.get("dependency-groups", {})
@@ -244,7 +241,7 @@ def handle(self) -> int:
                 assert isinstance(version, str)
                 parse_constraint(version)
 
-            constraint: dict[str, Any] = inline_table()
+            constraint = inline_table()
             for key, value in _constraint.items():
                 if key == "name":
                     continue
@@ -331,7 +328,7 @@ def handle(self) -> int:
 
                 # create a second constraint for tool.poetry.dependencies with keys
                 # that cannot be stored in the project section
-                poetry_constraint: dict[str, Any] = inline_table()
+                poetry_constraint = inline_table()
                 if not isinstance(constraint, str):
                     for key in ["allow-prereleases", "develop", "source"]:
                         if value := constraint.get(key):
@@ -413,7 +410,6 @@ def handle(self) -> int:
         status = self.installer.run()
 
         if status == 0 and not self.option("dry-run"):
-            assert isinstance(content, TOMLDocument)
             self.poetry.file.write(content)
 
         return status

src/poetry/console/commands/add.py

@@ -9,7 +9,6 @@
 from packaging.utils import canonicalize_name
 from poetry.core.packages.dependency import Dependency
 from poetry.core.packages.dependency_group import MAIN_GROUP
-from tomlkit.toml_document import TOMLDocument
 
 from poetry.console.commands.installer_command import InstallerCommand
 
@@ -63,7 +62,7 @@ def handle(self) -> int:
         else:
             group = self.option("group", self.default_group)
 
-        content: dict[str, Any] = self.poetry.file.read()
+        content = self.poetry.file.read()
         project_content = content.get("project", {})
         groups_content = content.get("dependency-groups", {})
         poetry_content = content.get("tool", {}).get("poetry", {})
@@ -179,7 +178,6 @@ def handle(self) -> int:
         status = self.installer.run()
 
         if not self.option("dry-run") and status == 0:
-            assert isinstance(content, TOMLDocument)
             self.poetry.file.write(content)
 
         return status

src/poetry/console/commands/remove.py

@@ -87,10 +87,10 @@ def generate_system_pyproject(self) -> None:
         package.python_versions = ".".join(str(v) for v in self.env.version_info[:3])
 
         content = Factory.create_legacy_pyproject_from_package(package=package)
-        content["tool"]["poetry"]["package-mode"] = False  # type: ignore[index]
+        content["tool"]["poetry"]["package-mode"] = False
 
         for key in preserved:
-            content["tool"]["poetry"][key] = preserved[key]  # type: ignore[index]
+            content["tool"]["poetry"][key] = preserved[key]
 
         if preserved_groups:
             content["dependency-groups"] = preserved_groups

src/poetry/console/commands/self/self_command.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
-from typing import Any
 from typing import ClassVar
 
 from cleo.helpers import argument
@@ -106,9 +105,7 @@ def handle(self) -> int:
             )
             return 1
 
-        # tomlkit types are awkward to work with, treat content as a mostly untyped
-        # dictionary.
-        content: dict[str, Any] = self.poetry.pyproject.data
+        content = self.poetry.pyproject.data
         if "tool" not in content:
             content["tool"] = table()
         if "poetry" not in content["tool"]:

src/poetry/console/commands/source/add.py

@@ -1,13 +1,11 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
-from typing import Any
 from typing import ClassVar
 
 from cleo.helpers import argument
 from cleo.helpers import option
 from poetry.core.version.exceptions import InvalidVersionError
-from tomlkit.toml_document import TOMLDocument
 
 from poetry.console.commands.command import Command
 
@@ -68,15 +66,14 @@ def handle(self) -> int:
                 )
 
             if not self.option("dry-run"):
-                content: dict[str, Any] = self.poetry.file.read()
+                content = self.poetry.file.read()
                 project_content = content.get("project", {})
                 if "version" in project_content:
                     project_content["version"] = version.text
                 poetry_content = content.get("tool", {}).get("poetry", {})
                 if "version" in poetry_content:
                     poetry_content["version"] = version.text
 
-                assert isinstance(content, TOMLDocument)
                 self.poetry.file.write(content)
         else:
             if self.option("short"):

src/poetry/console/commands/version.py

@@ -6,7 +6,6 @@
 
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import cast
 
 from cleo.io.null_io import NullIO
 from packaging.utils import NormalizedName
@@ -254,7 +253,7 @@ def create_legacy_pyproject_from_package(cls, package: Package) -> TOMLDocument:
 
         from poetry.utils.dependency_specification import dependency_to_specification
 
-        pyproject: dict[str, Any] = tomlkit.document()
+        pyproject = tomlkit.document()
 
         pyproject["tool"] = tomlkit.table(is_super_table=True)
 
@@ -350,8 +349,6 @@ def create_legacy_pyproject_from_package(cls, package: Package) -> TOMLDocument:
         if extras_section:
             content["extras"] = extras_section
 
-        pyproject = cast("TOMLDocument", pyproject)
-
         return pyproject
 
     @classmethod

src/poetry/factory.py

@@ -13,7 +13,6 @@
 from tomlkit import inline_table
 from tomlkit import loads
 from tomlkit import table
-from tomlkit.toml_document import TOMLDocument
 
 from poetry.factory import Factory
 from poetry.pyproject.toml import PyProjectTOML
@@ -23,6 +22,7 @@
     from collections.abc import Mapping
 
     from tomlkit.items import InlineTable
+    from tomlkit.toml_document import TOMLDocument
 
 
 POETRY_DEFAULT = """\
@@ -141,7 +141,7 @@ def generate_project_content(
     ) -> TOMLDocument:
         template = POETRY_DEFAULT
 
-        content: dict[str, Any] = loads(template)
+        content = loads(template)
 
         project_content = content["project"]
         project_content["name"] = self._project
@@ -212,7 +212,6 @@ def generate_project_content(
         build_system.add("requires", ["poetry-core" + build_system_version])
         build_system.add("build-backend", "poetry.core.masonry.api")
 
-        assert isinstance(content, TOMLDocument)
         content.add("build-system", build_system)
 
         return content