Skip to content

Commit 4136a4f

Browse files
committed
🔨 update OZI 1.19
Signed-off-by: rjdbcm <rjdbcm@outlook.com>
1 parent 8c7bc57 commit 4136a4f

File tree

5 files changed

+43
-34
lines changed

5 files changed

+43
-34
lines changed

blastpipe/malloc.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ def sizeof(obj: Union[Sized, Hashable]) -> int:
9292
size_total = getsizeof(obj, default_size)
9393

9494
if verbose:
95-
print(size_total, type(obj), repr(obj), file=stderr) # type: ignore
95+
print(size_total, type(obj), repr(obj), file=stderr) # pyright: ignore
9696

9797
for typ, handler in all_handlers.items():
9898
if isinstance(obj, typ):
99-
size_total += sum(map(sizeof, handler(obj))) # type: ignore
99+
size_total += sum(map(sizeof, handler(obj))) # pyright: ignore
100100
break
101101
return size_total
102102

meson.build

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fs = import('fs')
2323
pymod = import('python')
2424
project_name = meson.project_name()
2525
docs_source = 'subprojects/docs'
26-
pip_compile = find_program('pip-compile', required: true)
26+
pip_compile = find_program(get_option('compile-requirements-command')[0], required: true)
2727
root_files = [
2828
'README.rst',
2929
'CHANGELOG.md',
@@ -41,7 +41,7 @@ custom_target(
4141
build_always_stale: true,
4242
build_by_default: true,
4343
command: [
44-
'pip-compile',
44+
get_option('compile-requirements-command'),
4545
'--allow-unsafe',
4646
'--strip-extras',
4747
'-q',

meson.options

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
# Additional copyright and license terms apply, see NOTICE for details.
55
# DO NOT EDIT BY HAND - This file was generated for use with OZI tools.
66
# ozi-fix -> meson rewrite is the standard editing pipeline.
7+
option(
8+
'compile-requirements-command',
9+
type: 'array',
10+
value: ['uv', 'pip', 'compile'],
11+
)
12+
option(
13+
'install-requirements-command',
14+
type: 'array',
15+
value: ['uv', 'pip'],
16+
)
717
option(
818
'namespace',
919
type: 'array',

pyproject.toml

+27-28
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ license = {file = "LICENSE.txt"}
66

77
[build-system]
88
requires = [
9-
'OZI.build~=1.0.2',
10-
'pip-tools>=7',
11-
'pipx>=1.5',
12-
'setuptools_scm[toml]>=8.0',
9+
"OZI.build[core,uv]~=1.2",
1310
]
1411
build-backend = "ozi_build.buildapi"
1512

@@ -333,57 +330,59 @@ env_list =
333330
334331
[gh]
335332
python =
336-
3.12 = dist,lint,test
337-
3.11 = dist,lint,test
338-
3.10 = dist,lint,test
333+
3.12 = dist,lint,test
334+
3.11 = dist,lint,test
335+
3.10 = dist,lint,test
339336
340337
[testenv]
341338
allowlist_externals =
342339
rm
343340
pipx
344-
python
345341
meson
342+
python
346343
package = wheel
347344
deps =
348-
OZI.build>=0.0.27
349-
pip-tools>=7
350-
setuptools_scm[toml]>=8.0
351-
-r requirements.in
345+
uv
346+
commands_pre =
347+
python -m uv pip install -r requirements.in OZI.build[uv,core]~=1.2
348+
pipx install --python=python meson
352349
commands =
353-
meson compile -C {env_tmp_dir}
354-
rm -rf {env_tmp_dir}/.gitignore
350+
meson setup {env_tmp_dir} -Ddist=disabled -Dtox-env-dir={env_dir}
351+
meson compile -C {env_tmp_dir}
352+
rm -rf {env_tmp_dir}/.gitignore
353+
commands_post =
354+
{env_python} -m invoke --search-root={env_tmp_dir}/subprojects/ozi/ozi checkpoint --suite={env_name} {posargs}
355355
356356
[testenv:dist]
357-
commands_pre =
358-
pipx install --python=python meson
359-
meson setup {env_tmp_dir} -Dozi:dist=enabled -Dozi:tox-env-dir={env_dir}
360-
commands_post = meson test --no-rebuild --maxfail=1 -C {env_tmp_dir} --setup=dist
357+
description = OZI distribution checkpoint
361358
362359
[testenv:lint]
363-
commands_pre =
364-
pipx install --python=python meson
365-
meson setup {env_tmp_dir} -Dozi:lint=enabled -Dozi:tox-env-dir={env_dir}
366-
commands_post = meson test --no-rebuild --maxfail=1 -C {env_tmp_dir} --setup=lint
360+
description = OZI format/lint checkpoint
367361
368362
[testenv:test]
369-
commands_pre =
370-
pipx install --python=python meson
371-
meson setup {env_tmp_dir} -Dozi:test=enabled -Dozi:tox-env-dir={env_dir}
372-
commands_post = meson test --no-rebuild --maxfail=1 -C {env_tmp_dir} --setup=test
363+
description = OZI unit tests checkpoint
373364
374365
[testenv:fix]
375366
description = OZI project fix issues utility (black, isort, autoflake, ruff)
376367
deps = pipx
377368
skip_install = true
369+
commands_pre =
378370
commands =
379371
pipx run --python {env_python} black -S .
380372
pipx run --python {env_python} isort .
381373
pipx run --python {env_python} autoflake -i -r .
382-
pipx run --python {env_python} ruff check blastpipe --fix
374+
pipx run --python {env_python} ruff check ozi --fix
375+
commands_post =
383376
384377
[testenv:scm]
385378
description = OZI supply chain management (setuptools_scm)
386-
deps = setuptools_scm[toml]>=8
387379
commands =
388380
{env_python} -m setuptools_scm {posargs}
381+
commands_post =
382+
383+
[testenv:invoke]
384+
description = OZI invoke task entrypoint, for more info use "tox -e invoke -- --list"
385+
no_package = true
386+
commands_post =
387+
{env_python} -m invoke --search-root={env_tmp_dir}/subprojects/ozi/ozi {posargs:--list}
389388
"""

subprojects/ozi.wrap

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[wrap-git]
22
url = https://github.com/rjdbcm/ozi.git
3-
revision = release/1.18
3+
revision = release/1.19
44
depth = 1
55

66
[provide]
7-
dependency_names = ozi-0.5
7+
dependency_names = ozi-0.8

0 commit comments

Comments
 (0)