entangled-cli 2.1.9__tar.gz → 2.1.11__tar.gz

entangled_cli-2.1.11/.gitignore

@@ -0,0 +1,6 @@
+__pycache__
+.vscode
+.coverage
+coverage.*
+dist
+site

{entangled_cli-2.1.9 → entangled_cli-2.1.11}/PKG-INFO

@@ -1,28 +1,24 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: entangled-cli
-Version: 2.1.9
+Version: 2.1.11
 Summary: Literate Programming toolbox
-Home-page: https://entangled.github.io/
-License: Apache 2
-Author: Johan Hidding
-Author-email: j.hidding@esciencecenter.nl
-Requires-Python: >=3.11,<4.0
-Classifier: License :: Other/Proprietary License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: argh (>=0.30,<0.31)
-Requires-Dist: brei (>=0.2.3,<0.3.0)
-Requires-Dist: copier (>=9,<10)
-Requires-Dist: filelock (>=3.12.0,<4.0.0)
-Requires-Dist: mawk (>=0.1.4,<0.2.0)
-Requires-Dist: pexpect (>=4.9.0,<5.0.0)
-Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
-Requires-Dist: rich (>=13.3.5,<14.0.0)
-Requires-Dist: rich-argparse (>=1.4.0,<2.0.0)
-Requires-Dist: tomlkit (>=0.12.1,<0.13.0)
-Requires-Dist: watchdog (>=3.0.0,<4.0.0)
+Project-URL: Homepage, https://entangled.github.io/
 Project-URL: Repository, https://github.com/entangled/entangled.py
+Author-email: Johan Hidding <j.hidding@esciencecenter.nl>
+License-Expression: Apache-2.0
+License-File: LICENSE
+Requires-Python: ~=3.11
+Requires-Dist: argh<0.31,>=0.30
+Requires-Dist: brei<0.3,>=0.2.3
+Requires-Dist: copier<10,>=9
+Requires-Dist: filelock<4,>=3.12.0
+Requires-Dist: mawk<0.2,>=0.1.4
+Requires-Dist: pexpect<5,>=4.9.0
+Requires-Dist: pyyaml<7,>=6.0.1
+Requires-Dist: rich-argparse<2,>=1.4.0
+Requires-Dist: rich<14,>=13.3.5
+Requires-Dist: tomlkit<0.13,>=0.12.1
+Requires-Dist: watchdog<4,>=3.0.0
 Description-Content-Type: text/markdown
 
 # Entangled
@@ -181,6 +177,9 @@ identifiers = ["java"]
 comment = { open = "//" }
 ```
 
+## Working in VSCode
+The [EntangleD-VSCode](https://github.com/deephbz/entangled-vscode) extension provides code block navigation, reference&symbol search, NOWEB high-lighting functionalities.
+
 ## Working with Git
 
 When using Entangled in conjunction with Git, there are a few tricks that you may want to know about.
@@ -517,4 +516,3 @@ If you have an idea for improving Entangled, please file an issue before creatin
 ## License
 
 Copyright 2023 Netherlands eScience Center, written by Johan Hidding, licensed under the Apache 2 license, see LICENSE.
-

{entangled_cli-2.1.9 → entangled_cli-2.1.11}/README.md

@@ -154,6 +154,9 @@ identifiers = ["java"]
 comment = { open = "//" }
 ```
 
+## Working in VSCode
+The [EntangleD-VSCode](https://github.com/deephbz/entangled-vscode) extension provides code block navigation, reference&symbol search, NOWEB high-lighting functionalities.
+
 ## Working with Git
 
 When using Entangled in conjunction with Git, there are a few tricks that you may want to know about.

{entangled_cli-2.1.9 → entangled_cli-2.1.11}/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.9 → entangled_cli-2.1.11}/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.9 → entangled_cli-2.1.11}/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.9 → entangled_cli-2.1.11}/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.9 → entangled_cli-2.1.11}/entangled/hooks/quarto_attributes.py

@@ -34,13 +34,18 @@ class Hook(HookBase):
         attrs = yaml.safe_load(header)
         if attrs is None:
             return
+        if not isinstance(attrs, dict):
+            log.warning("quarto attributes do not evaluate to dictionary; skipping")
+            log.warning(f"tried to parse: {header}")
+            return
 
-        if "id" in attrs:
+        if "id" in attrs.keys():
             code.properties.append(Id(attrs["id"]))
 
-        if "classes" in attrs:
+        if "classes" in attrs.keys():
             code.properties.extend(Class(c) for c in attrs["classes"])
-        
-        code.properties.extend(Attribute(k, v) for k, v in attrs.items())
+
+        code.properties.extend(Attribute(k, v) for k, v in attrs.items()
+                                               if k not in ("id", "classes"))
 
         log.debug("quarto attributes: %s", attrs)

entangled_cli-2.1.11/pyproject.toml

@@ -0,0 +1,60 @@
+[project]
+name = "entangled-cli"
+version = "2.1.11"
+description = "Literate Programming toolbox"
+authors = [{ name = "Johan Hidding", email = "j.hidding@esciencecenter.nl" }]
+requires-python = "~=3.11"
+readme = "README.md"
+license = "Apache-2.0"
+dependencies = [
+    "mawk>=0.1.4,<0.2",
+    "watchdog>=3.0.0,<4",
+    "filelock>=3.12.0,<4",
+    "argh>=0.30,<0.31",
+    "rich>=13.3.5,<14",
+    "tomlkit>=0.12.1,<0.13",
+    "copier>=9,<10",
+    "brei>=0.2.3,<0.3",
+    "rich-argparse>=1.4.0,<2",
+    "pexpect>=4.9.0,<5",
+    "pyyaml>=6.0.1,<7",
+]
+
+[project.urls]
+Homepage = "https://entangled.github.io/"
+Repository = "https://github.com/entangled/entangled.py"
+
+[project.scripts]
+entangled = "entangled.main:cli"
+
+[dependency-groups]
+dev = [
+    "pytest>=7.3.1,<8",
+    "mypy>=1.3.0,<2",
+    "black>=23.3.0,<24",
+    "pytest-cov>=4.0.0,<5",
+    "mkdocs>=1.4.3,<2",
+    "mkdocs-material>=9.1.13,<10",
+    "mkdocstrings[python]>=0.21.2,<0.22",
+    "pytest-asyncio>=0.21.1,<0.22",
+    "ruff>=0.4.4,<0.5",
+    "types-pyyaml>=6.0.12.20240311,<7",
+    "types-pygments>=2.18.0.20240506,<3",
+    "types-colorama>=0.4.15.20240311,<0.5",
+]
+
+[tool.hatch.build.targets.sdist]
+include = ["entangled"]
+
+[tool.hatch.build.targets.wheel]
+include = ["entangled"]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.pytest.ini_options]
+testpaths = ["test"]
+
+[tool.mypy]
+packages = ["entangled"]

entangled_cli-2.1.9/pyproject.toml

@@ -1,52 +0,0 @@
-[tool.poetry]
-name = "entangled-cli"
-version = "2.1.9"
-description = "Literate Programming toolbox"
-repository = "https://github.com/entangled/entangled.py"
-homepage = "https://entangled.github.io/"
-authors = ["Johan Hidding <j.hidding@esciencecenter.nl>"]
-license = "Apache 2"
-readme = "README.md"
-packages = [{ include = "entangled" }]
-
-[tool.poetry.dependencies]
-python = "^3.11"
-mawk = "^0.1.4"          # use mawk as line parsing engine
-watchdog = "^3.0.0"      # file watching
-filelock = "^3.12.0"     # file lock for json db
-argh = "^0.30"           # easy argument parsing
-rich = "^13.3.5"         # colourful output
-tomlkit = "^0.12.1"      # read/write toml files
-copier = "^9"            # project templates
-brei = "^0.2.3"          # build system
-rich-argparse = "^1.4.0" # colourful help messages
-pexpect = "^4.9.0"
-pyyaml = "^6.0.1"
-
-[tool.poetry.group.dev.dependencies]
-pytest = "^7.3.1"
-mypy = "^1.3.0"
-black = "^23.3.0"
-pytest-cov = "^4.0.0"
-mkdocs = "^1.4.3"
-mkdocs-material = "^9.1.13"
-mkdocstrings = { extras = ["python"], version = "^0.21.2" }
-twine = "^4.0.2"
-pytest-asyncio = "^0.21.1"
-ruff = "^0.4.4"
-types-pyyaml = "^6.0.12.20240311"
-types-pygments = "^2.18.0.20240506"
-types-colorama = "^0.4.15.20240311"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.pytest.ini_options]
-testpaths = ["test"]
-
-[tool.mypy]
-packages = ["entangled"]
-
-[tool.poetry.scripts]
-entangled = "entangled.main:cli"