makejinja 2.3.2__tar.gz → 2.3.4__tar.gz

{makejinja-2.3.2 → makejinja-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: makejinja
-Version: 2.3.2
+Version: 2.3.4
 Summary: makejinja is a CLI tool and Python library to automatically generate files from Jinja2 templates. Use it to easily generate complex Home Assistant dashboards!
 Home-page: https://mirkolenz.github.io/makejinja/
 License: MIT
@@ -19,6 +19,7 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: File Formats
 Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Code Generators
@@ -39,7 +40,7 @@ Description-Content-Type: text/markdown
 
 <!-- markdownlint-disable MD033 MD041 -->
 <p align="center">
-  <img width="256px" src="https://raw.githubusercontent.com/mirkolenz/makejinja/main/assets/logo.png" />
+  <img width="256px" alt="makejinja logo" src="https://raw.githubusercontent.com/mirkolenz/makejinja/main/assets/logo.png" />
 </p>
 <p align="center">
   <a href="https://pypi.org/project/makejinja/">PyPI</a> |
@@ -96,7 +97,7 @@ You can then directly invoke the app as follows:
 
 ### Nix
 
-If you use the `nix` package manager, you can add this repository as an input to your flake and use `makejinja.packages.${system}.default`.
+If you use the `nix` package manager, you can add this repository as an input to your flake and use `makejinja.packages.${system}.default` or apply the overlay `makejinja.overlays.default`.
 You can also run it directly
 
 `nix run github:mirkolenz/makejinja -- -i ./input -o ./output`

{makejinja-2.3.2 → makejinja-2.3.4}/README.md

@@ -1,6 +1,6 @@
 <!-- markdownlint-disable MD033 MD041 -->
 <p align="center">
-  <img width="256px" src="https://raw.githubusercontent.com/mirkolenz/makejinja/main/assets/logo.png" />
+  <img width="256px" alt="makejinja logo" src="https://raw.githubusercontent.com/mirkolenz/makejinja/main/assets/logo.png" />
 </p>
 <p align="center">
   <a href="https://pypi.org/project/makejinja/">PyPI</a> |
@@ -57,7 +57,7 @@ You can then directly invoke the app as follows:
 
 ### Nix
 
-If you use the `nix` package manager, you can add this repository as an input to your flake and use `makejinja.packages.${system}.default`.
+If you use the `nix` package manager, you can add this repository as an input to your flake and use `makejinja.packages.${system}.default` or apply the overlay `makejinja.overlays.default`.
 You can also run it directly
 
 `nix run github:mirkolenz/makejinja -- -i ./input -o ./output`

{makejinja-2.3.2 → makejinja-2.3.4}/makejinja/__init__.py

@@ -1,4 +1,6 @@
 """
+**[🌟 GitHub Project 🌟](https://github.com/mirkolenz/makejinja)**
+
 ![Screencast demo](../assets/demo.gif)
 
 .. include:: ../README.md

{makejinja-2.3.2 → makejinja-2.3.4}/makejinja/app.py

@@ -45,9 +45,11 @@ def makejinja(config: Config):
     # Save rendered files to avoid duplicate work
     # Even if two files are in two separate folders, they will have the same template name (i.e., relative path)
     # and thus only the first one will be rendered every time
-    rendered_files: set[Path] = set()
+    # Key: output_path, Value: input_path
+    rendered_files: dict[Path, Path] = {}
 
     # Save rendered folders to later copy metadata
+    # Key: output_path, Value: input_path
     rendered_folders: dict[Path, Path] = {}
 
     for user_input_path in config.inputs:
@@ -58,10 +60,24 @@ def makejinja(config: Config):
                 user_input_path, config, env, rendered_files, rendered_folders
             )
 
-    # The metadata has to be copied after all files are rendered
-    # Otherwise the mtime will be updated
-    if config.copy_metadata:
-        for output_path, input_path in rendered_folders.items():
+    postprocess_rendered_folders(config, rendered_folders)
+
+
+def postprocess_rendered_folders(
+    config: Config,
+    rendered_folders: abc.Mapping[Path, Path],
+) -> None:
+    # Start with the deepest folder and work our way up, otherwise the statistics could be modified after copying
+    for output_path, input_path in sorted(
+        rendered_folders.items(), key=lambda x: x[0], reverse=True
+    ):
+        if not config.keep_empty and not any(output_path.iterdir()):
+            if not config.quiet:
+                print(f"Remove empty '{output_path}'")
+
+            shutil.rmtree(output_path)
+
+        elif config.copy_metadata:
             if not config.quiet:
                 print(f"Copy metadata '{input_path}' -> '{output_path}'")
 
@@ -82,7 +98,7 @@ def handle_input_file(
     input_path: Path,
     config: Config,
     env: Environment,
-    rendered_files: abc.MutableSet[Path],
+    rendered_files: abc.MutableMapping[Path, Path],
 ) -> None:
     relative_path = Path(input_path.name)
     output_path = generate_output_path(config, relative_path)
@@ -97,14 +113,14 @@ def handle_input_file(
             enforce_jinja_suffix=False,
         )
 
-    rendered_files.add(output_path)
+    rendered_files[output_path] = input_path
 
 
 def handle_input_folder(
     user_input_path: Path,
     config: Config,
     env: Environment,
-    rendered_files: abc.MutableSet[Path],
+    rendered_files: abc.MutableMapping[Path, Path],
     rendered_folders: abc.MutableMapping[Path, Path],
 ) -> None:
     input_paths = (
@@ -130,7 +146,7 @@ def handle_input_folder(
                 env,
                 enforce_jinja_suffix=True,
             )
-            rendered_files.add(output_path)
+            rendered_files[output_path] = input_path
 
         elif input_path.is_dir() and output_path not in rendered_folders:
             if not config.quiet:
@@ -280,7 +296,7 @@ def load_data(config: Config) -> dict[str, Any]:
             if not config.quiet:
                 print(f"Skip unsupported data '{path}'")
 
-    for key, value in config.data_vars:
+    for key, value in config.data_vars.items():
         dict_nested_set(data, key, value)
 
     return data

{makejinja-2.3.2 → makejinja-2.3.4}/makejinja/cli.py

@@ -31,6 +31,7 @@ def makejinja_cli(config: Config):
     **Note**: In this file, options may be named differently.
     Please refer to the file [`makejinja/config.py`](https://github.com/mirkolenz/makejinja/blob/main/makejinja/config.py) to see their actual names.
     You will also find an example here: [`makejinja/tests/data/makejinja.toml`](https://github.com/mirkolenz/makejinja/blob/main/tests/data/makejinja.toml).
+    To override its location, you can set the environment variable `MAKEJINJA_SETTINGS` to the path of your config file.
     """
 
     makejinja(config)

{makejinja-2.3.2 → makejinja-2.3.4}/makejinja/config.py

@@ -246,8 +246,8 @@ class Config:
         },
         help="""
                 Load variables from yaml/yml/toml/json files for use in your Jinja templates.
-                The defintions are passed to Jinja as globals.
-                Can either be a file or a folder containg files.
+                The definitions are passed to Jinja as globals.
+                Can either be a file or a folder containing files.
                 **Note:** This option may be passed multiple times to pass a list of values.
                 If multiple files are supplied, beware that previous declarations will be overwritten by newer ones.
             """,
@@ -274,9 +274,9 @@ class Config:
             Use custom Python code to adjust the used Jinja environment to your needs.
             The specified Python file should export a **class** containing a subset of the following functions:
             `filters`, `globals`, `data`, and `extensions`.
-            In addition, you may add an `__init__` function that recives two positional arguments:
+            In addition, you may add an `__init__` function that receives two positional arguments:
             the created Jinja environment and the data parsed from the files supplied to makejinja's `data` option.
-            This allows you to apply aribtrary logic to makejinja.
+            This allows you to apply arbitrary logic to makejinja.
             An import path can be specified either in dotted notation (`your.custom.Loader`)
             or with a colon as object delimiter (`your.custom:Loader`).
             **Note:** This option may be passed multiple times to pass a list of values.

{makejinja-2.3.2 → makejinja-2.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "makejinja"
-version = "2.3.2"
+version = "2.3.4"
 description = "makejinja is a CLI tool and Python library to automatically generate files from Jinja2 templates. Use it to easily generate complex Home Assistant dashboards!"
 authors = ["Mirko Lenz <mirko@mirkolenz.com>"]
 license = "MIT"