entangled-cli 2.0.1__tar.gz → 2.0.3__tar.gz

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: entangled-cli
-Version: 2.0.1
+Version: 2.0.3
 Summary: Literate Programming toolbox
 Home-page: https://entangled.github.io/
 License: Apache 2
@@ -13,9 +13,10 @@ 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 (>=8.3.0,<9.0.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: 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)
@@ -122,6 +123,9 @@ version = "2.0"
 
 # default watch_list is ["**/*.md"]
 watch_list = ["docs/**/*.md"]
+
+# default ignore_list is ["**/README.md"]
+ignore_list = ["docs/**/examples.md"]
 ```
 
 You may add languages as follows:

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/README.md

@@ -97,6 +97,9 @@ version = "2.0"
 
 # default watch_list is ["**/*.md"]
 watch_list = ["docs/**/*.md"]
+
+# default ignore_list is ["**/README.md"]
+ignore_list = ["docs/**/examples.md"]
 ```
 
 You may add languages as follows:

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/entangled/commands/new.py

@@ -123,7 +123,7 @@ def new(
             "Please supply both a [template] and a [project_path].\n", print_help
         )
 
-    copy_this_template: Optional[str] = template
+    copy_this_template: str = template
     trust_this_template: bool = trust
 
     # Use an officially supported template, if available, and trust it

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/entangled/commands/status.py

@@ -31,6 +31,9 @@ def rich_status():
     config_table.add_row(
         "Watch list", ", ".join(f"'{pat}'" for pat in config.watch_list)
     )
+    config_table.add_row(
+        "Ignore list", ", ".join(f"'{pat}'" for pat in config.ignore_list)
+    )
     config_table.add_row("Hooks enabled", ", ".join(config.hooks))
 
     console = Console(color_system="auto")

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/entangled/config/language.py

@@ -46,5 +46,6 @@ languages = [
     Language("F#", ["fsharp"], Comment("//")),
     Language("Javascript", ["javascript", "js", "ecma"], Comment("//")),
     Language("Go", ["go", "golang"], Comment("//")),
-    Language("R", ["r", "rlang"], Comment("#"))
+    Language("R", ["r", "rlang"], Comment("#")),
+    Language("Nix", ["nix"], Comment("#"))
 ]

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/entangled/construct.py

@@ -27,7 +27,7 @@ class FromStr:
 def construct(annot: Any, json: Any) -> Any:
     try:
         return _construct(annot, json)
-    except (AssertionError, ValueError, KeyError) as e:
+    except (AssertionError, ValueError, KeyError, TypeError) as e:
         raise ConfigError(annot, json) from e
 
 
@@ -47,6 +47,10 @@ def is_optional_type(dtype: Type[Any]) -> TypeGuard[Type[Optional[Any]]]:
     )
 
 
+def normalize_enum(x: str):
+    return x.upper().replace("-", "_")
+
+
 def _construct(annot: Type[T], json: Any) -> T:
     """Construct an object from a given type from a JSON stream.
 
@@ -70,14 +74,35 @@ def _construct(annot: Type[T], json: Any) -> T:
         )
     if annot is Any:
         return cast(T, json)
-    # if annot is dict or isgeneric(annot) and typing.get_origin(annot) is dict:
-    #    assert isinstance(json, dict)
-    #    return json
-    if annot is Path and isinstance(json, str):
-        return cast(T, Path(json))
+    
+    # dicts
+    if isgeneric(annot) and typing.get_origin(annot) is dict:
+        assert isinstance(json, dict)
+        return cast(T, {construct(typing.get_args(annot)[0], k): construct(typing.get_args(annot)[1], v)
+                        for k, v in json.items()})
+    if annot is dict:
+        assert isinstance(json, dict)
+        return cast(T, json)
+    
+    # lists
     if isgeneric(annot) and typing.get_origin(annot) is list:
         assert isinstance(json, list)
         return cast(T, [construct(typing.get_args(annot)[0], item) for item in json])
+    if annot is list:
+        assert isinstance(json, list)
+        return cast(T, json)
+
+    # sets
+    if isgeneric(annot) and typing.get_origin(annot) is set:
+        assert isinstance(json, list)
+        return cast(T, {construct(typing.get_args(annot)[0], item) for item in json})
+    if annot is set:
+        assert isinstance(json, list)
+        return cast(T, set(json))
+
+    if annot is Path and isinstance(json, str):
+        return cast(T, Path(json))
+    
     if is_optional_type(annot):
         if json is None:
             return cast(T, None)
@@ -97,13 +122,13 @@ def _construct(annot: Type[T], json: Any) -> T:
     if is_dataclass(annot):
         assert isinstance(json, dict)
         arg_annot = typing.get_type_hints(annot)
-        # assert all(k in json for k in arg_annot)
         args = {k: construct(arg_annot[k], json[k]) for k in json}
         return cast(T, annot(**args))
     if isinstance(json, str) and isinstance(annot, type) and issubclass(annot, Enum):
-        options = {opt.name.lower(): opt for opt in annot}
-        assert json.lower() in options
-        return cast(T, options[json.lower()])
+        options = {normalize_enum(e.name): e for e in annot}
+        assert isinstance(json, str)
+        assert normalize_enum(json) in options
+        return cast(T, options[normalize_enum(json)])
     raise ValueError(f"Couldn't construct {annot} from {repr(json)}")
 
 

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/entangled/hooks/__init__.py

@@ -1,5 +1,5 @@
 import logging
-from importlib_metadata import entry_points
+from importlib.metadata import entry_points
 
 from .base import HookBase, PrerequisitesFailed
 from . import build, task, quarto_attributes
@@ -12,7 +12,7 @@ discovered_hooks = entry_points(group="entangled.hooks")
 
 external_hooks = {
     name: discovered_hooks[name].load().Hook
-    for name in discovered_hooks
+    for name in discovered_hooks.names
 }
 
 hooks: dict[str, type[HookBase]] = {

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/entangled/status.py

@@ -16,9 +16,9 @@ def find_watch_dirs():
 
 def list_input_files():
     """List all input files."""
-    include_file_list = chain.from_iterable(map(Path(".").glob, config.watch_list))
+    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))
+        chain.from_iterable(map(Path().glob, config.ignore_list))
     )
     return [path for path in include_file_list if not path in exclude_file_list]
 

{entangled_cli-2.0.1 → entangled_cli-2.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "entangled-cli"
-version = "2.0.1"
+version = "2.0.3"
 description = "Literate Programming toolbox"
 repository = "https://github.com/entangled/entangled.py"
 homepage = "https://entangled.github.io/"
@@ -17,9 +17,10 @@ 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 = "^8.3.0"        # project templates
+copier = "^9"            # project templates
 brei = "^0.2.3"          # build system
 rich-argparse = "^1.4.0" # colourful help messages
+pexpect = "^4.9.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.3.1"
@@ -31,6 +32,7 @@ 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"
 
 [build-system]
 requires = ["poetry-core"]