entangled-cli 2.1.8__tar.gz → 2.1.10__tar.gz

{entangled_cli-2.1.8 → entangled_cli-2.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: entangled-cli
-Version: 2.1.8
+Version: 2.1.10
 Summary: Literate Programming toolbox
 Home-page: https://entangled.github.io/
 License: Apache 2
@@ -11,6 +11,7 @@ Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: argh (>=0.30,<0.31)
 Requires-Dist: brei (>=0.2.3,<0.3.0)
 Requires-Dist: copier (>=9,<10)

{entangled_cli-2.1.8 → entangled_cli-2.1.10}/entangled/commands/stitch.py

@@ -9,6 +9,7 @@ from ..config import config
 from ..document import ReferenceMap, Content, PlainText, ReferenceId
 from ..transaction import transaction, TransactionMode
 from ..errors.user import UserError
+from .tangle import get_input_files
 
 
 def stitch_markdown(reference_map: ReferenceMap, content: list[Content]) -> str:
@@ -32,14 +33,8 @@ def stitch(*, force: bool = False, show: bool = False):
     from ..markdown_reader import read_markdown_file
     from ..code_reader import CodeReader
     from ..hooks import get_hooks
-
-    include_file_list = chain.from_iterable(map(Path(".").glob, config.watch_list))
-    exclude_file_list = list(
-        chain.from_iterable(map(Path(".").glob, config.ignore_list))
-    )
-    input_file_list = [
-        path for path in include_file_list if not path in exclude_file_list
-    ]
+    
+    input_file_list = get_input_files()
     hooks = get_hooks()
 
     if show:

{entangled_cli-2.1.8 → entangled_cli-2.1.10}/entangled/commands/sync.py

@@ -6,7 +6,7 @@ import logging
 
 from ..filedb import file_db
 from ..config import config
-from .stitch import stitch
+from .stitch import stitch, get_input_files
 from .tangle import tangle
 
 
@@ -16,13 +16,7 @@ def _stitch_then_tangle():
 
 
 def sync_action() -> Optional[Callable[[], None]]:
-    include_file_list = set(
-        chain.from_iterable(map(Path().glob, config.watch_list))
-    )
-    exclude_file_list = set(
-        chain.from_iterable(map(Path().glob, config.ignore_list))
-    )
-    input_file_list = include_file_list - exclude_file_list
+    input_file_list = get_input_files()
 
     with file_db(readonly=True) as db:
         changed = set(db.changed())

{entangled_cli-2.1.8 → entangled_cli-2.1.10}/entangled/commands/tangle.py

@@ -14,11 +14,9 @@ from ..errors.user import UserError
 
 def get_input_files() -> list[Path]:
     include_file_list = chain.from_iterable(map(Path(".").glob, config.watch_list))
-    exclude_file_list = list(
-        chain.from_iterable(map(Path(".").glob, config.ignore_list))
-    )
     input_file_list = [
-        path for path in include_file_list if not path in exclude_file_list
+        path for path in include_file_list
+        if not any(path.match(pat) for pat in config.ignore_list)
     ]
     return input_file_list
 

{entangled_cli-2.1.8 → entangled_cli-2.1.10}/entangled/config/templates.py

@@ -26,4 +26,11 @@ templates: list[Template] = [
         "python, mkdocs",
         "Fast, simple project documentation for Python",
     ),
+    Template(
+        "pandoc",
+        "Pandoc",
+        "gh:entangled/template-pandoc",
+        "pandoc",
+        "Supports HTML and PDF output, numbered equations and citations."
+    )
 ]

{entangled_cli-2.1.8 → entangled_cli-2.1.10}/entangled/filedb.py

@@ -166,12 +166,17 @@ class FileDB:
             db = FileDB.read()
             undead = list(filter(lambda p: not p.exists(), db.files))
             for path in undead:
-                logging.warning(
-                    "File `%s` in DB doesn't exist. Removing entry from DB.", path
-                )
-                del db[path]
-            if len(undead) > 0:
-                db.write()
+                if path in db.managed:
+                    logging.warning(
+                        "File `%s` in DB seems not to exist, but this file is managed.\n"
+                        "This may happen every now and then with certain editors that "
+                        "delete a file before writing.", path
+                    )
+                else:
+                    logging.warning(
+                        "File `%s` is in database but doesn't seem to exist.\n"
+                        "Run `entangled tangle -r` to recreate the database.", path
+                    )
             return db
 
         FileDB.path().parent.mkdir(parents=True, exist_ok=True)

{entangled_cli-2.1.8 → entangled_cli-2.1.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "entangled-cli"
-version = "2.1.8"
+version = "2.1.10"
 description = "Literate Programming toolbox"
 repository = "https://github.com/entangled/entangled.py"
 homepage = "https://entangled.github.io/"