Skip to content

Commit 0664ddf

Browse files
henryborchershenryborchers
committed
ci: explicitly test non-gil wheels
1 parent 64a7187 commit 0664ddf

1 file changed

Lines changed: 17 additions & 14 deletions

File tree

‎Jenkinsfile‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
6868
stage("Build Wheel (${pythonVersion} MacOS ${arch})"){
6969
buildPythonPkg(
7070
agent: [
71-
label: "mac && python${pythonVersion} && ${arch}",
71+
label: "mac && python3 && ${arch}",
7272
],
7373
retries: 3,
7474
buildCmd: {
@@ -94,7 +94,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
9494
if(params.TEST_PACKAGES == true){
9595
testPythonPkg(
9696
agent: [
97-
label: "mac && python${pythonVersion} && ${arch}",
97+
label: "mac && python3 && ${arch}",
9898
],
9999
testSetup: {
100100
checkout scm
@@ -105,7 +105,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
105105
findFiles(glob: 'dist/*.whl').each{
106106
withEnv(["TOX_UV_PATH=${WORKSPACE}/venv/bin/uv"]){
107107
sh(label: 'Running Tox',
108-
script: """python${pythonVersion} -m venv venv
108+
script: """python3 -m venv venv
109109
. ./venv/bin/activate
110110
trap "rm -rf venv" EXIT
111111
python -m pip install --disable-pip-version-check uv
@@ -143,7 +143,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
143143
stage("Universal2 Wheel: Python ${pythonVersion}"){
144144
if(params.INCLUDE_MACOS_X86_64 && params.INCLUDE_MACOS_ARM){
145145
stage('Make Universal2 wheel'){
146-
node("mac && python${pythonVersion}") {
146+
node("mac && python3") {
147147
checkout scm
148148
unstash "python${pythonVersion} mac arm64 wheel"
149149
unstash "python${pythonVersion} mac x86_64 wheel"
@@ -153,7 +153,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
153153
}
154154
try{
155155
sh(label: 'Make Universal2 wheel',
156-
script: """python${pythonVersion} -m venv venv
156+
script: """python3 -m venv venv
157157
trap "rm -rf venv" EXIT
158158
./venv/bin/pip install --disable-pip-version-check uv
159159
./venv/bin/uv run --only-group package delocate-merge ${wheelNames.join(' ')} --verbose -w ./out/
@@ -182,7 +182,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
182182
stage("Test Python ${pythonVersion} universal2 Wheel on ${arch} mac"){
183183
testPythonPkg(
184184
agent: [
185-
label: "mac && python${pythonVersion} && ${arch}",
185+
label: "mac && python3 && ${arch}",
186186
],
187187
testSetup: {
188188
checkout scm
@@ -193,7 +193,7 @@ def mac_wheels(pythonVersions, testPackages, params, wheelStashes){
193193
findFiles(glob: 'dist/*.whl').each{
194194
withEnv(["TOX_UV_PATH=${WORKSPACE}/venv/bin/uv"]){
195195
sh(label: 'Running Tox',
196-
script: """python${pythonVersion} -m venv venv
196+
script: """python3 -m venv venv
197197
trap "rm -rf venv" EXIT
198198
./venv/bin/python -m pip install --disable-pip-version-check uv
199199
trap "rm -rf venv && rm -rf .tox" EXIT
@@ -277,7 +277,7 @@ def windows_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPip
277277
unstash "python${pythonVersion} windows wheel"
278278
findFiles(glob: 'dist/*.whl').each{
279279
bat """python -m pip install --disable-pip-version-check uv
280-
uv run --only-group=tox-uv tox run -e py${pythonVersion.replace('.', '')} --installpkg ${it.path}
280+
uv run --only-group=tox-uv tox run -e py${pythonVersion.replace('.', '').replace('+gil', '')} --installpkg ${it.path}
281281
rmdir /s /q .tox
282282
rmdir /s /q dist
283283
"""
@@ -1050,7 +1050,7 @@ pipeline {
10501050
stage("Test sdist (MacOS ${arch} - Python ${pythonVersion})"){
10511051
testPythonPkg(
10521052
agent: [
1053-
label: "mac && python${pythonVersion} && ${arch}",
1053+
label: "mac && python3 && ${arch}",
10541054
],
10551055
retries: 3,
10561056
testSetup: {
@@ -1061,9 +1061,9 @@ pipeline {
10611061
findFiles(glob: 'dist/*.tar.gz').each{
10621062
withEnv(["TOX_UV_PATH=${WORKSPACE}/venv/bin/uv"]){
10631063
sh(label: 'Running Tox',
1064-
script: """python${pythonVersion} -m venv venv
1064+
script: """python3 -m venv venv
10651065
venv/bin/python -m pip install --disable-pip-version-check uv
1066-
CONAN_REVISIONS_ENABLED=1 venv/bin/uv run --only-group=tox-uv tox run --installpkg ${it.path} -e py${pythonVersion.replace('.', '')}
1066+
CONAN_REVISIONS_ENABLED=1 venv/bin/uv run --only-group=tox-uv tox run --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil', '')}
10671067
rm -rf ./.tox
10681068
rm -rf ./venv
10691069
"""
@@ -1106,13 +1106,16 @@ pipeline {
11061106
def dockerImageName = "${currentBuild.fullProjectName}_${UUID.randomUUID().toString()}".replaceAll("-", "_").replaceAll('/', "_").replaceAll(' ', "").toLowerCase()
11071107
dockerImage = docker.build(dockerImageName, '-f scripts/resources/windows/Dockerfile --build-arg PIP_EXTRA_INDEX_URL --build-arg PIP_INDEX_URL --build-arg CHOCOLATEY_SOURCE --build-arg chocolateyVersion --build-arg PIP_DOWNLOAD_CACHE=c:/users/ContainerUser/appdata/local/pip --build-arg UV_INDEX_URL --build-arg UV_EXTRA_INDEX_URL --build-arg CONAN_CENTER_PROXY_V1_URL --build-arg UV_CACHE_DIR=c:/users/ContainerUser/appdata/local/uv' + (env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE ? " --build-arg FROM_IMAGE=${env.DEFAULT_DOCKER_DOTNET_SDK_BASE_IMAGE} ": ' ') + '.')
11081108
}
1109-
withEnv(['UV_PYTHON_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\uvpython']){
1110-
dockerImage.inside('--mount type=volume,source=uv_python_cache_dir,target=$UV_PYTHON_CACHE_DIR'){
1109+
withEnv([
1110+
'UV_PYTHON_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\uvpython',
1111+
'UV_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\cache\\uvcache'
1112+
]){
1113+
dockerImage.inside('--mount type=volume,source=uv_python_cache_dir,target=$UV_PYTHON_CACHE_DIR --mount type=volume,source=uv_cache_dir,target=$UV_CACHE_DIR'){
11111114
unstash 'python sdist'
11121115
findFiles(glob: 'dist/*.tar.gz').each{
11131116
powershell(
11141117
label: 'Running Tox',
1115-
script: "uv run --python=${pythonVersion} --only-group=tox-uv tox run --workdir \${Env.TEMP}\\.tox --installpkg ${it.path} -e py${pythonVersion.replace('.', '')} -vv"
1118+
script: "uv run --python=${pythonVersion} --only-group=tox-uv tox run --workdir \${Env:TEMP}\\.tox --installpkg ${it.path} -e py${pythonVersion.replace('.', '').replace('+gil','')} -vv"
11161119
)
11171120
}
11181121
}

0 commit comments

Comments
 (0)