entangled-cli 2.2.0__tar.gz → 2.2.1__tar.gz

{entangled_cli-2.2.0 → entangled_cli-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entangled-cli
-Version: 2.2.0
+Version: 2.2.1
 Summary: Literate Programming toolbox
 Project-URL: Homepage, https://entangled.github.io/
 Project-URL: Repository, https://github.com/entangled/entangled.py

{entangled_cli-2.2.0 → entangled_cli-2.2.1}/entangled/code_reader.py

@@ -66,7 +66,7 @@ class CodeReader(mawk.RuleSet):
     def on_block_end(self, m: re.Match[str]) -> list[str]:
         if m["indent"] != self.current.indent:
             raise IndentationError(self.location)
-        self.refs[self.current.ref].source = "\n".join(self.current.content)
+        self.refs.get_codeblock(self.current.ref).source = "\n".join(self.current.content)
         _ = self.stack.pop()
         return []
 

{entangled_cli-2.2.0 → entangled_cli-2.2.1}/entangled/commands/tangle.py

@@ -69,8 +69,8 @@ def tangle(*, annotate: str | None = None, force: bool = False, show: bool = Fal
 
             for tgt in refs.targets:
                 result, deps = tangle_ref(refs, tgt, annotation_method)
-                mode = next(refs[tgt]).mode
-                t.write(Path(tgt), result, list(map(Path, deps)), mode)
+                mask = next(iter(refs.by_name(tgt))).mode
+                t.write(Path(tgt), result, list(map(Path, deps)), mask)
 
             for h in hooks:
                 h.on_tangle(t, refs)

{entangled_cli-2.2.0 → entangled_cli-2.2.1}/entangled/document.py

@@ -1,13 +1,13 @@
 from textwrap import indent
-from typing import Optional, Union, Iterable, Any, override
+from collections.abc import Iterable
+from typing import override
 from dataclasses import dataclass, field
 from collections import defaultdict
 from functools import singledispatchmethod
-from itertools import chain
 from pathlib import PurePath
 
-from .config import Language, AnnotationMethod, config
-from .properties import Property, get_attribute
+from .config.language import Language
+from .properties import Property
 from .errors.internal import InternalError
 from .text_location import TextLocation
 
@@ -101,7 +101,7 @@ class ReferenceMap:
         return self.map[key]
 
     @singledispatchmethod
-    def __getitem__(self, key):
+    def __getitem__(self, key: ReferenceId | str) -> CodeBlock | Iterable[CodeBlock]:
         raise NotImplementedError(f"Invalid key: {type(key)}")
 
     @__getitem__.register
@@ -129,7 +129,7 @@ def content_to_text(r: ReferenceMap, c: Content) -> str:
         case ReferenceId(): return r.get_codeblock(c).indented_text
 
 
-def document_to_text(r: ReferenceMap, cs: list[Content]) -> str:
+def document_to_text(r: ReferenceMap, cs: Iterable[Content]) -> str:
     """
     Reconstruct original plain text content from a reference map and
     list of content.

{entangled_cli-2.2.0 → entangled_cli-2.2.1}/entangled/hooks/task.py

@@ -44,7 +44,7 @@ class Hook(HookBase):
         ref: ReferenceId
 
         def to_brei_task(self, refs: ReferenceMap):
-            cb = refs[self.ref]
+            cb = refs.get_codeblock(self.ref)
             if (path := get_attribute(cb.properties, "file")) is None:
                 script, _ = tangle_ref(refs, self.ref.name, AnnotationMethod.NAKED)
             else:

{entangled_cli-2.2.0 → entangled_cli-2.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "entangled-cli"
-version = "2.2.0"
+version = "2.2.1"
 description = "Literate Programming toolbox"
 authors = [{ name = "Johan Hidding", email = "j.hidding@esciencecenter.nl" }]
 requires-python = ">=3.12,<4"