✨ OZI spec 0.6

Adds cibuildwheel and twine and dist plugins.

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

meson.build

@@ -12,7 +12,7 @@ project(
 from packaging.version import Version
 v = get_version(normalize=False)
 if Version(v) < Version("0.1"):
-    print("0.4")
+    print("0.6")
 else:
     print(v)
 ''',
@@ -164,9 +164,11 @@ replace_ruff_target_version = run_command(
     check: true,
 ).stdout()
 run_command(python, ['-c', replace_ruff_target_version], check: true)
-pip = find_program('pip', required: true, disabler: true)
+pip = find_program(get_option('install-requirements-command')[0], 'pip', required: true, disabler: true)
 pipx = find_program('pipx', required: true, disabler: true)
-pip_compile = find_program('pip-compile', required: true)
+if get_option('compile-requirements-command')[0] != get_option('install-requirements-command')[0]
+    pip_compile = find_program(get_option('compile-requirements-command')[0], 'pip-compile', required: true)
+endif
 if not meson.is_subproject()
     custom_target(
         'requirements.txt',
@@ -175,7 +177,7 @@ if not meson.is_subproject()
         build_always_stale: true,
         build_by_default: true,
         command: [
-            'pip-compile',
+            get_option('compile-requirements-command'),
             '--allow-unsafe',
             '--strip-extras',
             '-q',
@@ -197,7 +199,7 @@ configure_file(
     command: [python, '-c', meson_setuptools_scm],
     output: 'PKG-INFO',
 )
-meson.add_dist_script(pip, 'install', 'tomli>=2.0.0')
+meson.add_dist_script(get_option('install-requirements-command'), 'install', 'tomli>=2.0.0')
 meson.add_dist_script(python, '-c', meson_dist_setuptools_scm)
 vcs_tag(input: 'pyproject.toml', output: 'pyproject.orig.toml')
 message('backed up pyproject.toml as pyproject.orig.toml')
@@ -265,9 +267,9 @@ foreach name : namespace
                     check: true
                 )
             else
-                message('install', command, 'with pip')
+                message('install', command, 'with', ' '.join(get_option('install-requirements-command')))
                 run_command(
-                    pip,
+                    get_option('install-requirements-command'),
                     [
                         'install',
                         get_option('install-args-'+command),
@@ -334,7 +336,7 @@ foreach name : namespace
                         kwargs: no_check,
                     ).stdout().strip()
                     fallback_version = run_command(
-                        pip,
+                        get_option('install-requirements-command'),
                         ['show', app],
                         kwargs: no_check,
                     ).stdout().split('\n')
@@ -361,7 +363,7 @@ foreach name : namespace
                     ).stdout().strip()
                     if app in module_only
                         fallback_version = run_command(
-                            pip,
+                            get_option('install-requirements-command'),
                             [
                                 'show',
                                 run_command(
@@ -374,7 +376,7 @@ foreach name : namespace
                         ).stdout().split('\n')
                     else
                         fallback_version = run_command(
-                            pip,
+                            get_option('install-requirements-command'),
                             ['show', app],
                             kwargs: no_check,
                         ).stdout().split('\n')
@@ -514,7 +516,7 @@ summary('path', python.full_path(), section: 'Python')
 summary('version', python.language_version(), section: 'Python')
 
 installed_packages = []
-foreach line : run_command('pip', 'freeze', check: true).stdout().split('\n')
+foreach line : run_command(get_option('install-requirements-command'), 'freeze', check: true).stdout().split('\n')
     if line == ''
         continue
     endif
@@ -547,5 +549,5 @@ foreach legacy_package: ['wheel', 'setuptools', 'distribute']
         endif
     endif
 endforeach
-pip_version = run_command(pip, '-V', check: true).stdout().split()
+pip_version = run_command(get_option('install-requirements-command'), '-V', check: true).stdout().split()
 summary(pip_version[0], pip_version[1], section: 'Python packages')

meson.options

@@ -8,6 +8,18 @@ option(
     value: 'disabled',
     description: 'blastpipe integration tests package',
 )
+option(
+    'compile-requirements-command',
+    type: 'array',
+    value: ['uv', 'pip', 'compile'],
+    yield: true,
+)
+option(
+    'install-requirements-command',
+    type: 'array',
+    value: ['uv', 'pip'],
+    yield: true,
+)
 option('dev', type: 'feature', value: 'auto')
 option('install-subprojects', type: 'feature', value: 'disabled')
 option('source-to-build', type: 'feature', value: 'auto')
@@ -139,12 +151,8 @@ option(
     type: 'array',
     description: 'install only - plugins for other utility applications',
     value: [
-        'pytest-asyncio',
-        'pytest-cov',
-        'pytest-xdist',
-        'pytest-tcpclient',
-        'pytest-randomly',
         'Flake8-pyproject',
+        'cibuildwheel',
         'flake8-annotations',
         'flake8-broken-line',
         'flake8-bugbear',
@@ -161,8 +169,14 @@ option(
         'flake8-tidy-imports',
         'flake8-type-checking',
         'hypothesis',
+        'pytest-asyncio',
+        'pytest-cov',
+        'pytest-randomly',
+        'pytest-tcpclient',
+        'pytest-xdist',
         'sphinxawesome-codelinter',
         'sphinxawesome-theme',
+        'twine',
     ],
 )
 

ozi/dist/cibuildwheel/meson.build

@@ -0,0 +1,12 @@
+# Part of the OZI Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+requirements = ['requirements.in']
+configure_file(
+    input: requirements,
+    output: 'requirements.txt',
+    command: [
+        get_option('compile-requirements-command'), get_option('config-args-semantic_release'),
+        '-o', '@OUTPUT@', '@INPUT@',
+    ]
+)

ozi/dist/cibuildwheel/requirements.in

@@ -0,0 +1 @@
+cibuildwheel~=2.20

ozi/dist/meson.build

@@ -8,7 +8,7 @@ source_child_dist_children = [
 ]
 if (get_option('dev').enabled() or get_option('dist').enabled())
     foreach package : source_child_dist_children
-        message('configure', package, 'with pip-compile')
+        message('configure', package, 'with', ' '.join(get_option('compile-requirements-command')))
         subdir(package)
     endforeach
 endif

ozi/dist/semantic_release/meson.build

@@ -6,7 +6,7 @@ configure_file(
     input: requirements,
     output: 'requirements.txt',
     command: [
-        'pip-compile', get_option('config-args-semantic_release'),
+        get_option('compile-requirements-command'), get_option('config-args-semantic_release'),
         '-o', '@OUTPUT@', '@INPUT@',
     ]
 )

ozi/dist/sigstore/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-sigstore'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-sigstore'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/dist/twine/meson.build

@@ -0,0 +1,12 @@
+# Part of the OZI Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+requirements = ['requirements.in']
+configure_file(
+    input: requirements,
+    output: 'requirements.txt',
+    command: [
+        get_option('compile-requirements-command'), get_option('config-args-semantic_release'),
+        '-o', '@OUTPUT@', '@INPUT@',
+    ]
+)

ozi/dist/twine/requirements.in

@@ -0,0 +1 @@
+twine

ozi/lint/bandit/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-bandit'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-bandit'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/lint/black/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-black'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-black'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/lint/flake8/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-flake8'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-flake8'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/lint/isort/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-isort'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-isort'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/lint/meson.build

@@ -13,7 +13,7 @@ source_child_lint_children = [
 ]
 if (get_option('dev').enabled() or get_option('lint').enabled())
     foreach package : source_child_lint_children
-        message('configure', package, 'with pip-compile')
+        message('configure', package, 'with', ' '.join(get_option('compile-requirements-command')))
         subdir(package)
     endforeach
 endif

ozi/lint/mypy/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-mypy'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-mypy'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/lint/pyright/meson.build

@@ -18,5 +18,5 @@ endif
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-pyright'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-pyright'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/lint/readme-renderer/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-readme-renderer'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-readme-renderer'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/tasks.py

@@ -14,15 +14,21 @@
 @task
 def sign_log(c: Context, suite: str | None = None) -> None:
     banned = './'
+    host = f'py{sys.version_info.major}{sys.version_info.minor}'
     if not suite:
         return print('No suite target provided', file=sys.stderr)
     if any(i in suite for i in banned):
         return print(f'Invalid sign target suite: {suite}', file=sys.stderr)
-    log = Path(f'.tox/{suite}/tmp/meson-logs/testlog-{suite}.txt')  # noqa: S108
-    if log.exists():
-        c.run(f'sigstore sign --output-dir=sig {log}')
+    testlog = Path(f'.tox/{suite}/tmp/meson-logs/testlog-{suite}.txt')  # noqa: S108
+    if testlog.exists():
+        c.run(f'sigstore sign --output-dir=sig/{host}/{suite} {testlog}')
     else:
-        print(f'Log not found for {suite}.', file=sys.stderr)
+        print(f'Test log not found for suite: {suite}.', file=sys.stderr)
+    meson_log = Path(f'.tox/{suite}/tmp/meson-logs/meson-log.txt')  # noqa: S108
+    if meson_log.exists():
+        c.run(f'sigstore sign --output-dir=sig/{host}/{suite} {meson_log}')
+    else:
+        print(f'Meson log not found for suite: {suite}.', file=sys.stderr)
 
 
 @task(
@@ -46,7 +52,7 @@ def release(c: Context, sdist: bool = False) -> None:
     if sdist:
         c.run('python -m build --sdist')
         c.run('sigstore sign dist/*.tar.gz')
-    ext_wheel = c.run('cibuildwheel --output-dir dist .')
+    ext_wheel = c.run('cibuildwheel --prerelease-pythons --output-dir dist .')
     if ext_wheel and ext_wheel.exited != 0:
         c.run('python -m build --wheel')
     c.run('sigstore sign --output-dir=sig dist/*.whl')
@@ -61,4 +67,5 @@ def provenance(c: Context) -> None:
 def publish(c: Context) -> None:
     """Publishes a release tag"""
     c.run('psr publish')
+    c.run('twine check dist/*')
     c.run('twine upload dist/*')

ozi/test/coverage/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-coverage'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-coverage'), '-o', '@OUTPUT@', '@INPUT@']
 )

ozi/test/meson.build

@@ -5,7 +5,7 @@
 source_child_test_children = ['coverage', 'pytest']
 if (get_option('dev').enabled() or get_option('test').enabled())
   foreach package : source_child_test_children
-      message('configure', package, 'with pip-compile')
+      message('configure', package, 'with', ' '.join(get_option('compile-requirements-command')))
       subdir(package)
   endforeach
 endif

ozi/test/pytest/meson.build

@@ -5,5 +5,5 @@ requirements = ['requirements.in']
 configure_file(
     input: requirements,
     output: 'requirements.txt',
-    command: ['pip-compile', get_option('config-args-pytest'), '-o', '@OUTPUT@', '@INPUT@']
+    command: [get_option('compile-requirements-command'), get_option('config-args-pytest'), '-o', '@OUTPUT@', '@INPUT@']
 )

pyproject.toml

@@ -5,8 +5,9 @@
 [build-system]
 build-backend = "ozi_build.buildapi"
 requires      = [
-    "OZI.build>=0.0.27",
+    "OZI.build>=1.0.2",
     "pip-tools>=7",
+    'uv',
     "pipx~=1.5",
     "setuptools_scm[toml]~=8.0",
 ]
@@ -77,7 +78,7 @@ fix  = ["black", "ruff>=0.1.6", "autoflake", "isort"]
 # Default meson test setup
 dev  = ["[dist,lint,test]"]
 ## Packaging Setup
-dist = ["python-semantic-release", "sigstore"]
+dist = ["cibuildwheel", "python-semantic-release", "sigstore", "twine"]
 ## Linting and Formatting Setup
 lint = ["bandit[toml]", "black", "flake8", "flake8-quotes",
         "flake8-pytest-style", "flake8-type-checking", "flake8-annotations",
@@ -99,6 +100,9 @@ verbose = true
 extend-exclude = "(\\.pyi|meson-private|venv)"
 line-length = 93
 
+[tool.cibuildwheel]
+build-frontend = "build[uv]"
+
 [tool.coverage.report]
 exclude_lines = [
     "^.*#\\s*(pragma|PRAGMA)[:\\s]?\\s*(no|NO)\\s*(cover|COVER)",