Skip to content

Commit

Permalink
🔨 update OZI 1.19
Browse files Browse the repository at this point in the history
Signed-off-by: rjdbcm <rjdbcm@outlook.com>
  • Loading branch information
rjdbcm committed Aug 23, 2024
1 parent 8c7bc57 commit 4136a4f
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 34 deletions.
4 changes: 2 additions & 2 deletions blastpipe/malloc.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ def sizeof(obj: Union[Sized, Hashable]) -> int:
size_total = getsizeof(obj, default_size)

if verbose:
print(size_total, type(obj), repr(obj), file=stderr) # type: ignore
print(size_total, type(obj), repr(obj), file=stderr) # pyright: ignore

for typ, handler in all_handlers.items():
if isinstance(obj, typ):
size_total += sum(map(sizeof, handler(obj))) # type: ignore
size_total += sum(map(sizeof, handler(obj))) # pyright: ignore
break
return size_total

Expand Down
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fs = import('fs')
pymod = import('python')
project_name = meson.project_name()
docs_source = 'subprojects/docs'
pip_compile = find_program('pip-compile', required: true)
pip_compile = find_program(get_option('compile-requirements-command')[0], required: true)
root_files = [
'README.rst',
'CHANGELOG.md',
Expand All @@ -41,7 +41,7 @@ custom_target(
build_always_stale: true,
build_by_default: true,
command: [
'pip-compile',
get_option('compile-requirements-command'),
'--allow-unsafe',
'--strip-extras',
'-q',
Expand Down
10 changes: 10 additions & 0 deletions meson.options
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@
# Additional copyright and license terms apply, see NOTICE for details.
# DO NOT EDIT BY HAND - This file was generated for use with OZI tools.
# ozi-fix -> meson rewrite is the standard editing pipeline.
option(
'compile-requirements-command',
type: 'array',
value: ['uv', 'pip', 'compile'],
)
option(
'install-requirements-command',
type: 'array',
value: ['uv', 'pip'],
)
option(
'namespace',
type: 'array',
Expand Down
55 changes: 27 additions & 28 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ license = {file = "LICENSE.txt"}

[build-system]
requires = [
'OZI.build~=1.0.2',
'pip-tools>=7',
'pipx>=1.5',
'setuptools_scm[toml]>=8.0',
"OZI.build[core,uv]~=1.2",
]
build-backend = "ozi_build.buildapi"

Expand Down Expand Up @@ -333,57 +330,59 @@ env_list =
[gh]
python =
3.12 = dist,lint,test
3.11 = dist,lint,test
3.10 = dist,lint,test
3.12 = dist,lint,test
3.11 = dist,lint,test
3.10 = dist,lint,test
[testenv]
allowlist_externals =
rm
pipx
python
meson
python
package = wheel
deps =
OZI.build>=0.0.27
pip-tools>=7
setuptools_scm[toml]>=8.0
-r requirements.in
uv
commands_pre =
python -m uv pip install -r requirements.in OZI.build[uv,core]~=1.2
pipx install --python=python meson
commands =
meson compile -C {env_tmp_dir}
rm -rf {env_tmp_dir}/.gitignore
meson setup {env_tmp_dir} -Ddist=disabled -Dtox-env-dir={env_dir}
meson compile -C {env_tmp_dir}
rm -rf {env_tmp_dir}/.gitignore
commands_post =
{env_python} -m invoke --search-root={env_tmp_dir}/subprojects/ozi/ozi checkpoint --suite={env_name} {posargs}
[testenv:dist]
commands_pre =
pipx install --python=python meson
meson setup {env_tmp_dir} -Dozi:dist=enabled -Dozi:tox-env-dir={env_dir}
commands_post = meson test --no-rebuild --maxfail=1 -C {env_tmp_dir} --setup=dist
description = OZI distribution checkpoint
[testenv:lint]
commands_pre =
pipx install --python=python meson
meson setup {env_tmp_dir} -Dozi:lint=enabled -Dozi:tox-env-dir={env_dir}
commands_post = meson test --no-rebuild --maxfail=1 -C {env_tmp_dir} --setup=lint
description = OZI format/lint checkpoint
[testenv:test]
commands_pre =
pipx install --python=python meson
meson setup {env_tmp_dir} -Dozi:test=enabled -Dozi:tox-env-dir={env_dir}
commands_post = meson test --no-rebuild --maxfail=1 -C {env_tmp_dir} --setup=test
description = OZI unit tests checkpoint
[testenv:fix]
description = OZI project fix issues utility (black, isort, autoflake, ruff)
deps = pipx
skip_install = true
commands_pre =
commands =
pipx run --python {env_python} black -S .
pipx run --python {env_python} isort .
pipx run --python {env_python} autoflake -i -r .
pipx run --python {env_python} ruff check blastpipe --fix
pipx run --python {env_python} ruff check ozi --fix
commands_post =
[testenv:scm]
description = OZI supply chain management (setuptools_scm)
deps = setuptools_scm[toml]>=8
commands =
{env_python} -m setuptools_scm {posargs}
commands_post =
[testenv:invoke]
description = OZI invoke task entrypoint, for more info use "tox -e invoke -- --list"
no_package = true
commands_post =
{env_python} -m invoke --search-root={env_tmp_dir}/subprojects/ozi/ozi {posargs:--list}
"""
4 changes: 2 additions & 2 deletions subprojects/ozi.wrap
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[wrap-git]
url = https://github.com/rjdbcm/ozi.git
revision = release/1.18
revision = release/1.19
depth = 1

[provide]
dependency_names = ozi-0.5
dependency_names = ozi-0.8

0 comments on commit 4136a4f

Please sign in to comment.