✨ move spec to ozi-spec package

Signed-off-by: rjdbcm <[email protected]>

ozi/__init__.py

@@ -11,7 +11,26 @@
 
    The ozi_templates module was moved out of blastpipe.
 """
-from .spec import current_version
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version
+
+from setuptools_scm import get_version  # type: ignore
+
+
+def current_version() -> str:
+    """Returns the currently installed version of OZI.
+    
+    .. versionchanged:: 1.14
+
+      Previously was part of the ozi.spec submodule.
+
+    """
+    try:
+        version_ = version('OZI')
+    except PackageNotFoundError:  # pragma: no cover
+        version_ = str(get_version(root='..', relative_to=__file__))
+    return version_
+
 
 __version__ = current_version()
 __author__ = 'Eden Ross Duff MSc'

ozi/actions.py

@@ -23,7 +23,7 @@
 from spdx_license_list import LICENSES
 
 from ozi.spdx import spdx_license_expression
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 from ozi.trove import Prefix
 from ozi.trove import from_prefix

ozi/comment.py

@@ -15,7 +15,7 @@
 from typing import Generator
 from typing import Sequence
 
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 
 if TYPE_CHECKING:
@@ -92,7 +92,7 @@ def calculate_score(lines: int, t1: int, t2: int, t3: int) -> float:  # pragma:
 def pattern_cache(key: str) -> re.Pattern[str]:  # pragma: no cover
     """Cached OZI specification linter comment pattern lookup.
 
-    :param key: key in :py:class:`ozi.spec.CommentPatterns`
+    :param key: key in :py:class:`ozi_spec.CommentPatterns`
     :type key: str
     :return: compiled regular expression pattern
     :rtype: re.Pattern[str]
@@ -109,7 +109,7 @@ def pattern_search(
 
     :param line: line text verbatim
     :type line: str
-    :yield: key, match for key in :py:class:`ozi.spec.CommentPatterns` excluding ``help``
+    :yield: key, match for key in :py:class:`ozi_spec.CommentPatterns` excluding ``help``
     :rtype: Generator[tuple[str, str], None, None]
     """
     for key in METADATA.spec.python.src.comments.asdict().keys():

ozi/fix/__main__.py

@@ -16,7 +16,7 @@
 from ozi.fix.missing import report
 from ozi.fix.parser import parser
 from ozi.fix.rewrite_command import Rewriter
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 
 

ozi/fix/build_definition.py

@@ -12,7 +12,7 @@
 from ozi import comment
 from ozi.meson import get_items_by_suffix
 from ozi.meson import query_build_value
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 
 IGNORE_MISSING = {

ozi/fix/missing.py

@@ -17,7 +17,7 @@
 from ozi.meson import load_ast
 from ozi.meson import project_metadata
 from ozi.pkg_extra import parse_extra_pkg_info
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 
 if sys.version_info >= (3, 11):  # pragma: no cover

ozi/fix/rewrite_command.py

@@ -18,7 +18,7 @@
 from ozi.render import build_child
 from ozi.render import build_file
 from ozi.render import find_user_template
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 
 if TYPE_CHECKING:
     import sys

ozi/meson.build

@@ -27,7 +27,6 @@ source_children = [
     'lint',
     'new',
     'scripts',
-    'spec',
     'test',
     'vendor',
 ]

ozi/new/__main__.py

@@ -28,7 +28,7 @@
 from ozi.new.validate import valid_summary
 from ozi.render import render_ci_files_set_user
 from ozi.render import render_project_files
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 
 if TYPE_CHECKING:

ozi/new/interactive.py

@@ -47,7 +47,7 @@
 from prompt_toolkit.widgets import Label
 from prompt_toolkit.widgets import RadioList
 
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 from ozi.trove import Prefix
 from ozi.trove import from_prefix

ozi/new/parser.py

@@ -10,7 +10,7 @@
 import sys
 
 from ozi.actions import CloseMatch
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 
 parser = argparse.ArgumentParser(
     prog='ozi-new',

ozi/new/validate.py

@@ -17,7 +17,7 @@
 from trove_classifiers import classifiers
 
 from ozi.spdx import spdx_license_expression
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 from ozi.vendor.email_validator import EmailNotValidError
 from ozi.vendor.email_validator import EmailSyntaxError

ozi/render.py

@@ -16,7 +16,7 @@
 from git import Repo
 from ozi_templates.filter import underscorify  # type: ignore
 
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 from ozi.tap import TAP
 
 if TYPE_CHECKING:

ozi/spdx.py

@@ -10,7 +10,7 @@
 from pyparsing import oneOf
 from spdx_license_list import LICENSES
 
-from ozi.spec import METADATA
+from ozi_spec import METADATA
 
 spdx_license_expression = Forward()
 spdx_license_expression <<= oneOf(