Skip to content

Commit b60e7d5

Browse files
henryborchershenryborchers
committed
ci: pin tox-uv-bare
1 parent 5db84c8 commit b60e7d5

3 files changed

Lines changed: 181 additions & 118 deletions

File tree

‎Jenkinsfile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def windows_wheels(pythonVersions, testPackages, params, wheelStashes){
181181
bat(label: 'Running Tox',
182182
script: """python -m venv venv
183183
venv\\Scripts\\pip install --disable-pip-version-check uv
184-
venv\\Scripts\\uv run --only-group tox --python ${pythonVersion} --with tox-uv tox run -e py${pythonVersion.replace('.', '').replace('+gil', '')} --installpkg ${it.path}
184+
venv\\Scripts\\uv run --only-group=tox --python ${pythonVersion} tox run -e py${pythonVersion.replace('.', '').replace('+gil', '')} --installpkg ${it.path}
185185
rmdir /S /Q venv
186186
rmdir /S /Q .tox
187187
"""
@@ -269,7 +269,7 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes){
269269
script: """python3 -m venv venv
270270
trap "rm -rf venv" EXIT
271271
./venv/bin/pip install --disable-pip-version-check uv
272-
./venv/bin/uv run --only-group=tox --with=tox-uv tox --installpkg ${findFiles(glob:'dist/*.whl')[0].path} -e py${pythonVersion.replace('.', '').replace('+gil','')}
272+
./venv/bin/uv run --only-group=tox tox --installpkg ${findFiles(glob:'dist/*.whl')[0].path} -e py${pythonVersion.replace('.', '').replace('+gil','')}
273273
rm -rf .tox
274274
"""
275275
)
@@ -356,7 +356,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
356356
sh(label: 'Running Tox',
357357
script: """python3 -m venv venv
358358
./venv/bin/python -m pip install --disable-pip-version-check uv
359-
./venv/bin/uv run --only-group tox --with tox-uv tox run --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}"""
359+
./venv/bin/uv run --only-group=tox tox run --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}"""
360360
)
361361
}
362362
}
@@ -435,7 +435,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
435435
trap "rm -rf venv" EXIT
436436
./venv/bin/python -m pip install --disable-pip-version-check uv
437437
trap "rm -rf venv && rm -rf .tox" EXIT
438-
./venv/bin/uv run --only-group tox --python=${pythonVersion} --with tox-uv tox --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}
438+
./venv/bin/uv run --only-group=tox --python=${pythonVersion} tox --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}
439439
"""
440440
)
441441
}
@@ -924,11 +924,11 @@ pipeline {
924924
checkout scm
925925
withEnv(["UV_CONFIG_FILE=${createUVConfig()}"]){
926926
try{
927-
docker.image('python').inside('--mount source=python-tmp-py3exiv2bind,target=/tmp'){
927+
docker.image('ghcr.io/astral-sh/uv:debian').inside('--mount source=python-tmp-py3exiv2bind,target=/tmp'){
928928
sh(script: 'python3 -m venv venv && venv/bin/pip install --disable-pip-version-check uv')
929929
envs = sh(
930930
label: 'Get tox environments',
931-
script: './venv/bin/uv run --quiet --only-group tox --with tox-uv --frozen tox list -d --no-desc',
931+
script: './venv/bin/uv run --quiet --only-group=tox --frozen tox list -d --no-desc',
932932
returnStdout: true,
933933
).trim().split('\n')
934934
}
@@ -960,7 +960,7 @@ pipeline {
960960
withEnv(["UV_CONFIG_FILE=${createUVConfig()}"]){
961961
image.inside('--mount source=python-tmp-py3exiv2bind,target=/tmp'){
962962
sh( label: 'Running Tox',
963-
script: "uv run --only-group tox -p ${version} --python-preference only-system --with tox-uv tox run -e ${toxEnv} --runner uv-venv-lock-runner -vvv"
963+
script: "uv run --only-group=tox -p ${version} --python-preference=only-system tox run -e ${toxEnv} --runner uv-venv-lock-runner -vvv"
964964
)
965965
}
966966
}
@@ -998,7 +998,7 @@ pipeline {
998998
node('docker && windows'){
999999
checkout scm
10001000
try{
1001-
withEnv(["UV_CONFIG_FILE=${createUVConfig()}"]){
1001+
withEnv(["UV_CONFIG_FILE=${createUVConfig()}", "TOX_UV_PATH=${WORKSPACE}\\venv\\Scripts\\uv.exe"]){
10021002
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python')
10031003
.inside("\
10041004
--mount type=volume,source=uv_python_install_dir,target=${env.UV_PYTHON_INSTALL_DIR} \
@@ -1009,7 +1009,7 @@ pipeline {
10091009
bat(script: 'python -m venv venv && venv\\Scripts\\pip install --disable-pip-version-check uv')
10101010
envs = bat(
10111011
label: 'Get tox environments',
1012-
script: '@.\\venv\\Scripts\\uv run --quiet --only-group tox --with tox-uv --frozen tox list -d --no-desc',
1012+
script: '@.\\venv\\Scripts\\uv run --quiet --only-group=tox --frozen tox list -d --no-desc',
10131013
returnStdout: true,
10141014
).trim().split('\r\n')
10151015
}
@@ -1047,7 +1047,7 @@ pipeline {
10471047
try{
10481048
bat(label: 'Running Tox',
10491049
script: """uv python install cpython-${version}
1050-
uv run --only-group tox --with tox-uv tox run -e ${toxEnv} --runner uv-venv-lock-runner -vv
1050+
uv run --only-group=tox tox run -e ${toxEnv} --runner uv-venv-lock-runner -vv
10511051
"""
10521052
)
10531053
} catch(err){
@@ -1211,7 +1211,7 @@ pipeline {
12111211
trap "rm -rf venv" EXIT
12121212
./venv/bin/python -m pip install --disable-pip-version-check uv
12131213
trap "rm -rf venv && rm -rf .tox" EXIT
1214-
./venv/bin/uv run --only-group tox --python=${pythonVersion} --with tox-uv tox --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}
1214+
./venv/bin/uv run --only-group=tox --python=${pythonVersion} tox --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}
12151215
"""
12161216
)
12171217
}
@@ -1270,7 +1270,7 @@ pipeline {
12701270
timeout(60){
12711271
try{
12721272
bat(label: 'Running Tox',
1273-
script: """uv run --only-group tox --with tox-uv tox run --runner=uv-venv-runner --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')} -vv
1273+
script: """uv run --only-group=tox tox run --runner=uv-venv-runner --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')} -vv
12741274
rmdir /S /Q .tox
12751275
"""
12761276
)
@@ -1344,7 +1344,7 @@ pipeline {
13441344
timeout(60){
13451345
sh(label: 'Running Tox',
13461346
script: """trap "rm -rf .tox" EXIT
1347-
uv run --only-group tox --python=${pythonVersion} --python-preference only-system --with tox-uv tox --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}
1347+
uv run --only-group=tox --python=${pythonVersion} --python-preference only-system tox --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}
13481348
"""
13491349
)
13501350
}

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ test = [
3535
]
3636
audit-dependencies = ['uv-secure']
3737
docs = ["sphinx", "setuptools", "toml; python_version < '3.11'"]
38-
tox = ["tox"]
38+
tox = ["tox", "tox-uv-bare"]
3939
dev = [
4040
{include-group = "docs"},
4141
{include-group = "tox"},

0 commit comments

Comments
 (0)