Skip to content

Commit 2fca82b

Browse files
committed
Don't wrap commands with uv in Meson run targets
1 parent ecd756d commit 2fca82b

File tree

3 files changed

+729
-14
lines changed

3 files changed

+729
-14
lines changed

meson.build

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,11 @@ run_target(
5050
command: ['ctags', '-R', '@SOURCE_ROOT@/systemd'],
5151
)
5252

53-
# Use 'uv run' to ensure Sphinx and its dependencies are installed before being run.
54-
uv_prog = find_program('uv')
55-
5653
# The '--no-editable' option tells uv to install the systemd package so that Sphinx can import it and extract docstrings.
5754
run_target(
5855
'doc',
5956
command: [
60-
uv_prog,
61-
'run',
62-
'--group', 'docs',
63-
'--no-editable',
57+
python,
6458
'-m', 'sphinx',
6559
'-b', 'html',
6660
'-D', 'version=' + meson.project_version(),
@@ -73,11 +67,8 @@ run_target(
7367
# The '--no-editable' option tells uv to install the systemd package so tests can import it.
7468
test(
7569
'pytest',
76-
uv_prog,
70+
python,
7771
args: [
78-
'run',
79-
'--group', 'test',
80-
'--no-editable',
8172
'-m', 'pytest',
8273
'../systemd/test',
8374
],
@@ -110,5 +101,5 @@ run_target(
110101
# NOTE: Run 'sign' target before 'upload' to ensure the signature file exists.
111102
run_target(
112103
'upload',
113-
command: ['uvx', 'twine', 'upload', archive, signature_filename],
104+
command: [python, '-m', 'twine', 'upload', archive, signature_filename],
114105
)

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test = ["pytest", "pytest-cov"]
4141
docs = ["sphinx"]
4242
build = [
4343
"meson>=1.8.2",
44+
"twine>=4.0.2",
4445
]
4546

4647
[build-system]

0 commit comments

Comments
 (0)