entangled-cli 2.3.0__tar.gz → 2.3.1__tar.gz

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/PKG-INFO

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

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/entangled/commands/reset.py

@@ -40,7 +40,7 @@ def reset():
             for path in input_file_list:
                 logging.debug("reading `%s`", path)
                 t.update(path)
-                _, _ = read_markdown_file(path, refs=refs, hooks=hooks)
+                _, _ = read_markdown_file(t, path, refs=refs, hooks=hooks)
 
             for h in hooks:
                 h.pre_tangle(refs)

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/entangled/commands/stitch.py

@@ -46,17 +46,16 @@ def stitch(*, force: bool = False, show: bool = False):
     refs = ReferenceMap()
     content: dict[Path, list[Content]] = {}
     try:
-        for path in input_file_list:
-            logging.debug("reading `%s`", path)
-            _, c = read_markdown_file(path, refs=refs, hooks=hooks)
-            content[path] = c
-
         with transaction(mode) as t:
+            for path in input_file_list:
+                logging.debug("reading `%s`", path)
+                _, c = read_markdown_file(t, path, refs=refs, hooks=hooks)
+                content[path] = c
+
             for path in t.db.managed_files:
                 logging.debug("reading `%s`", path)
                 t.update(path)
-                with open(path, "r") as f:
-                    CodeReader(path, refs).run(f.read())
+                _ = CodeReader(path, refs).run(t.read(path))
 
             for path in input_file_list:
                 t.write(path, stitch_markdown(refs, content[path]), [])

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/entangled/commands/tangle.py

@@ -52,7 +52,7 @@ def tangle(*, annotate: str | None = None, force: bool = False, show: bool = Fal
             for path in input_file_list:
                 logging.debug("reading `%s`", path)
                 t.update(path)
-                _, _ = read_markdown_file(path, refs=refs, hooks=hooks)
+                _, _ = read_markdown_file(t, path, refs=refs, hooks=hooks)
 
             for h in hooks:
                 h.pre_tangle(refs)

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/entangled/io/stat.py

@@ -55,7 +55,7 @@ class FileData:
         if stat is None:
             return None
 
-        with open(path, "r") as f:
+        with open(path, "r", encoding="utf-8") as f:
             content = f.read()
             digest = hexdigest(content)
 

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/entangled/io/transaction.py

@@ -158,6 +158,9 @@ class Transaction:
         else:
             logging.debug("target `%s` unchanged", path)
 
+    def read(self, path: Path) -> str:
+        return self.fs[path].content
+
     def clear_orphans(self):
         orphans = self.db.managed_files - self.passed
         if not orphans:

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/entangled/io/virtual.py

@@ -25,7 +25,7 @@ def atomic_write(target: Path, content: str, mode: int | None):
     """
     tmp_dir = Path() / ".entangled" / "tmp"
     tmp_dir.mkdir(exist_ok=True, parents=True)
-    with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=tmp_dir) as f:
+    with tempfile.NamedTemporaryFile(mode="w", delete=False, dir=tmp_dir, encoding="utf-8") as f:
         _ = f.write(assure_final_newline(content))
         # Flush and sync contents to disk
         f.flush()
@@ -53,7 +53,7 @@ class FileCache:
         """
         if key not in self._data:
             if (s := stat(key)) is None:
-                raise KeyError()
+                raise FileNotFoundError(key)
             self._data[key] = s
         return self._data[key]
 

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/entangled/markdown_reader.py

@@ -8,6 +8,8 @@ import mawk
 import logging
 
 from entangled.config.language import Language
+from entangled.io.transaction import Transaction
+from entangled.io.virtual import FileCache
 
 from .config import config
 from .utility import first
@@ -146,8 +148,8 @@ class MarkdownLexer(mawk.RuleSet):
         self.flush_plain_text()
         return []
 
-
 def read_markdown_file(
+    t: Transaction,
     path: Path,
     refs: ReferenceMap | None = None,
     hooks: list[HookBase] | None = None) \
@@ -167,9 +169,8 @@ def read_markdown_file(
     content is a list of `PlainText | ReferenceId`. Each `ReferenceId` can be
     looked up in the reference map.
     """
-    with open(path, "r") as f:
-        rel_path = path.resolve().relative_to(Path.cwd())
-        return read_markdown_string(f.read(), rel_path, refs, hooks)
+    rel_path = path.resolve().relative_to(Path.cwd())
+    return read_markdown_string(t.read(rel_path), rel_path, refs, hooks)
 
 
 def read_markdown_string(

{entangled_cli-2.3.0 → entangled_cli-2.3.1}/pyproject.toml

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