ozi-core - npm Package Compare versions

Comparing version 1.21.21 to 1.21.22

.github/workflows/cleanup.yml

@@ -18,3 +18,3 @@ name: cleanup caches by a branch
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -21,0 +21,0 @@ disable-sudo: true

.github/workflows/dev.yml

@@ -24,3 +24,3 @@ # Part of the OZI Project, under the Apache License v2.0 with LLVM Exceptions.
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -48,3 +48,3 @@ disable-sudo: false
 
-      - uses: OZI-Project/checkpoint@bc80bd040b1b6705a270fc6b111b08dfe6cde16b # 1.9.9
+      - uses: OZI-Project/checkpoint@1faf4433bbcc31ed6a0104896a92564d94182b20 # 1.10.0
         with:
@@ -63,3 +63,3 @@ python-version: "3.10"
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -85,3 +85,3 @@ disable-sudo: true
 
-      - uses: OZI-Project/checkpoint@bc80bd040b1b6705a270fc6b111b08dfe6cde16b # 1.9.9
+      - uses: OZI-Project/checkpoint@1faf4433bbcc31ed6a0104896a92564d94182b20 # 1.10.0
         with:
@@ -101,3 +101,3 @@ python-version: "3.10"
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -125,3 +125,3 @@ disable-sudo: false
 
-      - uses: OZI-Project/checkpoint@bc80bd040b1b6705a270fc6b111b08dfe6cde16b # 1.9.9
+      - uses: OZI-Project/checkpoint@1faf4433bbcc31ed6a0104896a92564d94182b20 # 1.10.0
         with:
@@ -140,3 +140,3 @@ python-version: "3.11"
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -164,3 +164,3 @@ disable-sudo: false
 
-      - uses: OZI-Project/checkpoint@bc80bd040b1b6705a270fc6b111b08dfe6cde16b # 1.9.9
+      - uses: OZI-Project/checkpoint@1faf4433bbcc31ed6a0104896a92564d94182b20 # 1.10.0
         with:
@@ -180,3 +180,3 @@ python-version: "3.12"
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -206,5 +206,5 @@ disable-sudo: false
 
-      - uses: OZI-Project/checkpoint@bc80bd040b1b6705a270fc6b111b08dfe6cde16b
+      - uses: OZI-Project/checkpoint@1faf4433bbcc31ed6a0104896a92564d94182b20
         with:
           python-version: "3.13"
           submodules: true

.github/workflows/ozi.yml

@@ -23,3 +23,3 @@ name: OZI
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -46,3 +46,3 @@ disable-sudo: false
 
-      - uses: OZI-Project/checkpoint@1.9.9
+      - uses: OZI-Project/checkpoint@1.10.0
         with:
@@ -61,3 +61,3 @@ python-version: "3.11"
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -84,3 +84,3 @@ disable-sudo: false
 
-      - uses: OZI-Project/checkpoint@1.9.9
+      - uses: OZI-Project/checkpoint@1.10.0
         with:
@@ -100,3 +100,3 @@ python-version: "3.12"
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -124,3 +124,3 @@ disable-sudo: false
 
-      - uses: OZI-Project/checkpoint@1.9.9
+      - uses: OZI-Project/checkpoint@1.10.0
         with:
@@ -135,3 +135,3 @@ python-version: "3.13"
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -155,3 +155,3 @@ disable-sudo: true
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -164,3 +164,3 @@ disable-sudo: true
 
-      - uses: OZI-Project/draft@1.17.2
+      - uses: OZI-Project/draft@1.17.3
         id: draft
@@ -191,3 +191,3 @@ with:
       - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
@@ -217,3 +217,3 @@ disable-sudo: false
 
-      - uses: OZI-Project/release@eb10d9730ae9ad7c7c63e016d714013b4e017d5d
+      - uses: OZI-Project/release@60a6112177f9e232a55f0d2dfe3aa0d2da322cf1
         id: release
@@ -251,3 +251,3 @@ with:
     - name: Harden Runner
-      uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
       with:
@@ -267,3 +267,3 @@ disable-sudo: true
 
-    - uses: OZI-Project/publish@1.17.2
+    - uses: OZI-Project/publish@1.17.3
       with:
@@ -273,2 +273,2 @@ github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Publish package distributions to PyPI
-      uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
+      uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e

ozi_core/fix/rewrite_command.py

@@ -23,3 +23,2 @@ # ozi/fix/rewrite_command.py
 from ozi_core.render import build_file
-from ozi_core.render import find_user_template
 
@@ -121,7 +120,2 @@ if TYPE_CHECKING:  # pragma: no cover
             / '__init__.py',
-            find_user_template(
-                self.target,
-                f'{filename}/__init__.py.j2',
-                '.',
-            ),
         )
@@ -139,10 +133,3 @@
         else:
-            build_file(
-                self.env,
-                self.fix,
-                child,
-                user_template=find_user_template(
-                    self.target, filename, self.path_map[self.fix]('.').name
-                ),
-            )
+            build_file(self.env, self.fix, child)
         if filename.endswith('.pyx'):  # pragma: no cover
@@ -228,5 +215,2 @@ cmd_files.add('ext', 'files', str(Path(filename)))
             except OSError:
-                warn(
-                    _('term-warn-remove-dir'),
-                    RuntimeWarning,
-                )
+                warn(_('term-warn-remove-dir'), RuntimeWarning)

ozi_core/render.py

@@ -5,3 +5,6 @@ # ozi/render.py
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-"""Rendering utilities for the OZI project templates."""
+"""Rendering utilities for the OZI project templates.
+.. versionchanged:: 2.1.17
+   Removed find_user_template
+"""
 from __future__ import annotations
@@ -24,3 +27,2 @@
 from ozi_core import __version__
-from ozi_core._i18n import TRANSLATION as _
 from ozi_core._logging import PytestFilter
@@ -38,25 +40,2 @@ from ozi_core._logging import config_logger
 
-def find_user_template(target: str, file: str, fix: str) -> str | None:
-    """Find a user-defined project template file e.g. :file:`{target}/templates/{fix}/{file}`.
-
-    :param target: path to an OZI project directory
-    :type target: Path
-    :param file: filename
-    :type file: str
-    :param fix: template directory fix path
-    :type fix: str
-    :return: a user-defined template as a string
-    :rtype: str | None
-    """
-    fp = Path(target, 'templates', fix, file)
-    if fp.exists():
-        user_template = str(
-            fp.relative_to(Path(target, 'templates'))
-        )  # pragma: defer to E2E
-    else:
-        TAP.ok(_('term-tap-user-template-not-found'), skip=True, template=str(fp))
-        user_template = None
-    return user_template
-
-
 def map_to_template(  # noqa: C901
@@ -129,3 +108,2 @@ fix: (
     path: Path,
-    user_template: str | None,
     **kwargs: str,
@@ -147,6 +125,3 @@ ) -> None:
     try:
-        template = env.get_template(map_to_template(fix, path.name)).render(
-            user_template=user_template,
-            **kwargs,
-        )
+        template = env.get_template(map_to_template(fix, path.name)).render(**kwargs)
         path.parent.mkdir(parents=True, exist_ok=True)
@@ -182,3 +157,2 @@ path.write_text(template)
             (child / 'meson.build'),
-            find_user_template(str(parent / child), 'meson.build.j2', '.'),
             parent=parent,
@@ -259,7 +233,2 @@ )
                     target / filename.replace('github_workflows', '.github/workflows'),
-                    find_user_template(
-                        str(target),
-                        str(filename).replace('github_workflows', '.github/workflows'),
-                        '.',
-                    ),
                 )
@@ -297,3 +266,2 @@ case _:  # pragma: no cover
                 target / filename,
-                find_user_template(str(target), filename, '.'),
             )

ozi_core/render.pyi

@@ -17,15 +17,2 @@ """
 
-def find_user_template(target: str, file: str, fix: str) -> str | None:
-    """Find a user-defined project template file e.g. :file:`{target}/templates/{fix}/{file}`.
-
-    :param target: path to an OZI project directory
-    :type target: Path
-    :param file: filename
-    :type file: str
-    :param fix: template directory fix path
-    :type fix: str
-    :return: a user-defined template as a string
-    :rtype: str | None
-    """
-
 def map_to_template(
@@ -61,3 +48,2 @@ fix: (
     path: Path,
-    user_template: str | None,
     **kwargs: str
@@ -64,0 +50,0 @@ ) -> None:

PKG-INFO

 Metadata-Version: 2.3
 Requires-Python: >=3.9, <3.14
 Name: ozi-core
-Version: 1.21.21
+Version: 1.21.22
 Author: Eden Ross Duff MSc
@@ -29,4 +29,4 @@ Author-email: [e-mail]
 Requires-Dist: meson[ninja]~=1.1,<1.9
-Requires-Dist: ozi-templates==2.29.8
-Requires-Dist: ozi-spec==1.1.6
+Requires-Dist: ozi-templates==2.29.9
+Requires-Dist: ozi-spec==1.1.8
 Requires-Dist: packaging>=24.1,<26.0
@@ -39,3 +39,3 @@ Requires-Dist: platformdirs~=4.3
 Requires-Dist: spdx-license-list==3.27.0
-Requires-Dist: trove-classifiers==2025.8.26.11
+Requires-Dist: trove-classifiers==2025.9.9.12
 Requires-Dist: typing-extensions;python_version<="3.11"
@@ -42,0 +42,0 @@ Requires-Dist: types-PyYAML~=6.0

pyproject.toml

@@ -12,3 +12,3 @@ # Part of ozi-core.
 name = "ozi-core"
-version = "1.21.21"
+version = "1.21.22"
 authors=[{name="Eden Ross Duff MSc", email="[e-mail]"}]
@@ -40,4 +40,4 @@ classifiers=[
     'meson[ninja]~=1.1,<1.9',
-    'ozi-templates==2.29.8',
-    'ozi-spec==1.1.6',
+    'ozi-templates==2.29.9',
+    'ozi-spec==1.1.8',
     'packaging>=24.1,<26.0',
@@ -50,3 +50,3 @@ 'platformdirs~=4.3',
     'spdx-license-list==3.27.0',
-    'trove-classifiers==2025.8.26.11',
+    'trove-classifiers==2025.9.9.12',
     'typing-extensions;python_version<="3.11"',
@@ -53,0 +53,0 @@ 'types-PyYAML~=6.0',

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

914909

0.49%

Worsened metrics

Lines of code

9519

-0.6%