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

entangled_cli-2.1.12/.gitignore

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

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

@@ -1,29 +1,24 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: entangled-cli
-Version: 2.1.10
+Version: 2.1.12
 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
-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)
-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
@@ -182,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.
@@ -518,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.10 → entangled_cli-2.1.12}/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.10 → entangled_cli-2.1.12}/entangled/code_reader.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from pathlib import Path
+from pathlib import Path, PurePath
 
 import mawk
 import re
@@ -18,9 +18,9 @@ class Frame:
 class CodeReader(mawk.RuleSet):
     """Reads an annotated code file."""
 
-    def __init__(self, path: str, refs: ReferenceMap):
+    def __init__(self, path: PurePath, refs: ReferenceMap):
         self.location = TextLocation(path, 0)
-        self.stack: list[Frame] = [Frame(ReferenceId("#root#", "", -1), "")]
+        self.stack: list[Frame] = [Frame(ReferenceId("#root#", PurePath("-"), -1), "")]
         self.refs: ReferenceMap = refs
 
     @property
@@ -56,7 +56,7 @@ class CodeReader(mawk.RuleSet):
 
         self.stack.append(
             Frame(
-                ReferenceId(m["ref_name"], m["source"], ref_count), m["indent"], content
+                ReferenceId(m["ref_name"], PurePath(m["source"]), ref_count), m["indent"], content
             )
         )
         return []

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

@@ -57,7 +57,7 @@ def stitch(*, force: bool = False, show: bool = False):
                 logging.debug("reading `%s`", path)
                 t.update(path)
                 with open(path, "r") as f:
-                    CodeReader(str(path), refs).run(f.read())
+                    CodeReader(path, refs).run(f.read())
 
             for path in input_file_list:
                 t.write(path, stitch_markdown(refs, content[path]), [])

{entangled_cli-2.1.10 → entangled_cli-2.1.12}/entangled/document.py

@@ -3,6 +3,7 @@ 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
@@ -17,7 +18,7 @@ def length(iter: Iterable[Any]) -> int:
 @dataclass
 class ReferenceId:
     name: str
-    file: str
+    file: PurePath
     ref_count: int
 
     def __hash__(self):
@@ -71,7 +72,7 @@ class ReferenceMap:
 
         return (self.map[r] for r in self.index[n])
 
-    def new_id(self, filename: str, name: str) -> ReferenceId:
+    def new_id(self, filename: PurePath, name: str) -> ReferenceId:
         c = length(filter(lambda r: r.file == filename, self.index[name]))
         return ReferenceId(name, filename, c)
 

{entangled_cli-2.1.10 → entangled_cli-2.1.12}/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.10 → entangled_cli-2.1.12}/entangled/markdown_reader.py

@@ -1,6 +1,6 @@
 from typing import Optional
 from copy import copy
-from pathlib import Path
+from pathlib import Path, PurePath
 
 import re
 import mawk
@@ -20,8 +20,8 @@ class MarkdownLexer(mawk.RuleSet):
     content."""
     def __init__(
         self,
-        filename: str
-    ):
+        filename: Path
+    ): 
         self.location = TextLocation(filename)
         self.raw_content: list[RawContent] = []
         self.inside_codeblock: bool = False
@@ -122,13 +122,13 @@ def read_markdown_file(
     -> tuple[ReferenceMap, list[Content]]:
 
     with open(path, "r") as f:
-        path_str = str(path.resolve().relative_to(Path.cwd()))
-        return read_markdown_string(f.read(), path_str, refs, hooks)
+        rel_path = path.resolve().relative_to(Path.cwd())
+        return read_markdown_string(f.read(), rel_path, refs, hooks)
 
 
 def read_markdown_string(
         text: str,
-        path_str: str = "-",
+        path_str: Path = Path("-"),
         refs: ReferenceMap | None = None,
         hooks: list[HookBase] | None = None) \
         -> tuple[ReferenceMap, list[Content]]:

{entangled_cli-2.1.10 → entangled_cli-2.1.12}/entangled/tangle.py

@@ -95,7 +95,7 @@ class AnnotatedTangler(Tangler):
         if self.cb.header is not None:
             result.append(self.cb.header)
         result.append(
-            f"{self.cb.language.comment.open} ~/~ begin <<{self.ref.file}#{self.ref.name}>>[{count}]{self.close_comment}"
+            f"{self.cb.language.comment.open} ~/~ begin <<{self.ref.file.as_posix()}#{self.ref.name}>>[{count}]{self.close_comment}"
         )
         return result
 

{entangled_cli-2.1.10 → entangled_cli-2.1.12}/entangled/text_location.py

@@ -1,9 +1,10 @@
 from dataclasses import dataclass
+from pathlib import PurePath
 
 
 @dataclass
 class TextLocation:
-    filename: str
+    filename: PurePath
     line_number: int = 0
 
     def __str__(self):

entangled_cli-2.1.12/pyproject.toml

@@ -0,0 +1,60 @@
+[project]
+name = "entangled-cli"
+version = "2.1.12"
+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.10/pyproject.toml

@@ -1,52 +0,0 @@
-[tool.poetry]
-name = "entangled-cli"
-version = "2.1.10"
-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"