Skip to content

Commit

Permalink
🐛 fix invoke meson option setting
Browse files Browse the repository at this point in the history
Signed-off-by: rjdbcm <[email protected]>
  • Loading branch information
rjdbcm committed Aug 23, 2024
1 parent 256e81a commit c8bedb4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ozi/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def setup(c: Context, suite: str = 'dist', draft: bool = False) -> None | Result
target = Path(f'.tox/{suite}/tmp').absolute() # noqa: S108
env_dir = Path(f'.tox/{suite}').absolute()
c.run(
f'meson setup {target} -D{suite}=enabled -Dtox-env-dir={env_dir} --reconfigure',
f'meson setup {target} -Dozi:{suite}=enabled -Dozi:tox-env-dir={env_dir} --reconfigure',
)
if draft and suite == 'dist':
return c.run('psr --strict version')
Expand Down
13 changes: 6 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
[build-system]
build-backend = "ozi_build.buildapi"
requires = [
"OZI.build>=1.0.2",
"invoke~=2.2",
"pip-tools>=7",
"pipx~=1.5",
"setuptools_scm[toml]~=8.0",
'uv',
"OZI.build[core,uv]~=1.2",
]

[tool.ozi-build.entry-points]
Expand Down Expand Up @@ -379,7 +374,7 @@ package = wheel
deps =
uv
commands_pre =
python -m uv pip install -r requirements.in OZI.build>=1.0.2 invoke~=2.2 pip-tools>=7 pipx~=1.5 setuptools_scm[toml]~=8.0
python -m uv pip install -r requirements.in OZI.build[uv,core]~=1.2
pipx install --python=python meson
commands =
meson setup {env_tmp_dir} -Ddist=disabled -Dtox-env-dir={env_dir}
Expand All @@ -396,6 +391,10 @@ description = OZI format/lint checkpoint
[testenv:test]
description = OZI unit tests checkpoint
commands =
meson setup {env_tmp_dir} -Dozi-blastpipe=enabled -Ddist=disabled -Dtox-env-dir={env_dir}
meson compile -C {env_tmp_dir}
rm -rf {env_tmp_dir}/.gitignore
[testenv:fix]
description = OZI project fix issues utility (black, isort, autoflake, ruff)
Expand Down

0 comments on commit c8bedb4

Please sign in to comment.