🚸 move ozi.tap to TAP-Producer package

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

ozi/actions.py

@@ -22,9 +22,9 @@
 from packaging.version import parse
 from pyparsing import ParseException
 from spdx_license_list import LICENSES
+from tap_producer import TAP
 
 from ozi.spdx import spdx_license_expression
-from ozi.tap import TAP
 from ozi.trove import Prefix
 from ozi.trove import from_prefix
 

ozi/comment.py

@@ -16,8 +16,7 @@
 from typing import Sequence
 
 from ozi_spec import METADATA  # pyright: ignore
-
-from ozi.tap import TAP
+from tap_producer import TAP
 
 if TYPE_CHECKING:
     from pathlib import Path

ozi/fix/__main__.py

@@ -13,11 +13,11 @@
 from ozi_spec import METADATA  # pyright: ignore
 from ozi_templates import load_environment  # type: ignore
 from ozi_templates.filter import underscorify  # type: ignore
+from tap_producer import TAP
 
 from ozi.fix.missing import report
 from ozi.fix.parser import parser
 from ozi.fix.rewrite_command import Rewriter
-from ozi.tap import TAP
 
 
 def main() -> NoReturn:  # pragma: no cover

ozi/fix/build_definition.py

@@ -10,11 +10,11 @@
 from typing import Generator
 
 from ozi_spec import METADATA  # pyright: ignore
+from tap_producer import TAP
 
 from ozi import comment
 from ozi.meson import get_items_by_suffix
 from ozi.meson import query_build_value
-from ozi.tap import TAP
 
 IGNORE_MISSING = {
     'subprojects',

ozi/fix/missing.py

@@ -13,12 +13,12 @@
 
 from ozi_spec import METADATA  # pyright: ignore
 from ozi_templates.filter import underscorify  # type: ignore
+from tap_producer import TAP
 
 from ozi.fix.build_definition import walk
 from ozi.meson import load_ast
 from ozi.meson import project_metadata
 from ozi.pkg_extra import parse_extra_pkg_info
-from ozi.tap import TAP
 
 if sys.version_info >= (3, 11):  # pragma: no cover
     import tomllib as toml

ozi/meson.build

@@ -12,7 +12,6 @@ source_files = [
     'py.typed',
     'render.py',
     'spdx.py',
-    'tap.py',
     'trove.py',
 ]
 foreach file : files(source_files)

ozi/meson.py

@@ -24,8 +24,7 @@
 from mesonbuild.mparser import PlusAssignmentNode
 from mesonbuild.mparser import StringNode
 from mesonbuild.mparser import UMinusNode
-
-from ozi.tap import TAP
+from tap_producer import TAP
 
 SelectValue: TypeAlias = type[AssignmentNode | PlusAssignmentNode | NotNode | UMinusNode]
 

ozi/new/__main__.py

@@ -14,6 +14,7 @@
 
 from ozi_spec import METADATA  # pyright: ignore
 from ozi_templates import load_environment  # type: ignore
+from tap_producer import TAP
 
 from ozi.new.interactive import interactive_prompt
 from ozi.new.parser import parser
@@ -29,7 +30,6 @@
 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.tap import TAP
 
 if TYPE_CHECKING:
     from argparse import Namespace

ozi/new/interactive.py

@@ -47,8 +47,8 @@
 from prompt_toolkit.widgets import Dialog
 from prompt_toolkit.widgets import Label
 from prompt_toolkit.widgets import RadioList
+from tap_producer import TAP
 
-from ozi.tap import TAP
 from ozi.trove import Prefix
 from ozi.trove import from_prefix
 

ozi/new/validate.py

@@ -15,10 +15,10 @@
 from pyparsing import ParseException
 from pyparsing import ParseResults
 from pyparsing import Regex
+from tap_producer import TAP
 from trove_classifiers import classifiers
 
 from ozi.spdx import spdx_license_expression
-from ozi.tap import TAP
 from ozi.vendor.email_validator import EmailNotValidError
 from ozi.vendor.email_validator import EmailSyntaxError
 from ozi.vendor.email_validator import ValidatedEmail

ozi/render.py

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

requirements.in

@@ -1,10 +1,11 @@
 GitPython>=3
+TAP-Producer>=0.0.2
 dnspython
 idna>=2
 jinja2>=3
 meson[ninja]>=1.1.0
 ozi-spec~=0.4
-ozi-templates~=2.4.8
+ozi-templates~=2.4.9
 packaging~=24.0
 pip-tools
 prompt_toolkit

tests/meson.build

@@ -5,7 +5,6 @@
 test_files = [
     'test_ozi_fix.py',
     'test_ozi_new.py',
-    'test_tap.py',
 ]
 foreach file: test_files
   fs.copyfile(file)

tests/test_ozi_new.py

@@ -15,12 +15,12 @@
 from hypothesis import strategies as st
 from ozi_spec import METADATA  # pyright: ignore
 from ozi_templates import load_environment  # pyright: ignore
+from tap_producer import TAP  # pyright: ignore
 
 import ozi.actions  # pyright: ignore
 import ozi.new.__main__  # pyright: ignore
 from ozi.fix.missing import required_files  # pyright: ignore
 from ozi.fix.missing import required_pkg_info  # pyright: ignore
-from ozi.tap import TAP  # pyright: ignore
 
 
 @settings(