Skip to content

Commit 8a49ddf

Browse files
henryborchershenryborchers
committed
ci: remove refs to unsafe-best-match
1 parent 485d45d commit 8a49ddf

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

‎Jenkinsfile‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ def windows_wheels(pythonVersions, testPackages, params, wheelStashes){
169169
'UV_PYTHON_INSTALL_DIR=C:\\Users\\ContainerUser\\Documents\\cache\\uvpython',
170170
'UV_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\cache\\uvcache',
171171
'UV_TOOL_DIR=C:\\Users\\ContainerUser\\Documents\\uvtools',
172-
'UV_INDEX_STRATEGY=unsafe-best-match',
173172
"UV_CONFIG_FILE=${createUVConfig()}"
174173
]){
175174
findFiles(glob: 'dist/*.whl').each{
@@ -250,11 +249,9 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes){
250249
try{
251250
withEnv([
252251
'PIP_CACHE_DIR=/tmp/pipcache',
253-
'UV_INDEX_STRATEGY=unsafe-best-match',
254252
'UV_TOOL_DIR=/tmp/uvtools',
255253
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
256254
'UV_CACHE_DIR=/tmp/uvcache',
257-
'UV_INDEX_STRATEGY=unsafe-best-match',
258255
"UV_CONFIG_FILE=${createUVConfig()}"
259256
]){
260257
docker.image('python').inside('--mount source=python-tmp-py3exiv2bind,target=/tmp'){
@@ -505,12 +502,11 @@ pipeline {
505502
filename 'ci/docker/linux/jenkins/Dockerfile'
506503
label 'linux && docker && x86'
507504
additionalBuildArgs '--build-arg PIP_EXTRA_INDEX_URL --build-arg CONAN_CENTER_PROXY_V2_URL'
508-
args '--mount source=sonar-cache-py3exiv2bind,target=/opt/sonar/.sonar/cache --mount source=python-tmp-py3exiv2bind,target=/tmp'
505+
args '--mount source=sonar-cache-py3exiv2bind,target=/opt/sonar/.sonar/cache --mount source=python-tmp-py3exiv2bind,target=/tmp --mount type=tmpfs,dst=/.cache/puccinialin/'
509506
}
510507
}
511508
environment{
512509
PIP_CACHE_DIR='/tmp/pipcache'
513-
UV_INDEX_STRATEGY='unsafe-best-match'
514510
UV_TOOL_DIR='/tmp/uvtools'
515511
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
516512
UV_CACHE_DIR='/tmp/uvcache'
@@ -525,7 +521,7 @@ pipeline {
525521
sh(
526522
label: 'Create virtual environment',
527523
script: '''mkdir -p build/python
528-
uv sync --group ci --no-install-project
524+
uv sync --group ci --no-install-project --no-managed-python
529525
mkdir -p build/temp
530526
mkdir -p build/lib
531527
mkdir -p build/docs
@@ -898,7 +894,6 @@ pipeline {
898894
stage('Linux'){
899895
environment{
900896
PIP_CACHE_DIR='/tmp/pipcache'
901-
UV_INDEX_STRATEGY='unsafe-best-match'
902897
UV_TOOL_DIR='/tmp/uvtools'
903898
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
904899
UV_CACHE_DIR='/tmp/uvcache'
@@ -976,7 +971,6 @@ pipeline {
976971
expression {return nodesByLabel('windows && docker && x86').size() > 0}
977972
}
978973
environment{
979-
UV_INDEX_STRATEGY='unsafe-best-match'
980974
PIP_CACHE_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\pipcache'
981975
UV_TOOL_DIR='C:\\Users\\ContainerUser\\Documents\\uvtools'
982976
UV_PYTHON_INSTALL_DIR='C:\\Users\\ContainerUser\\Documents\\cache\\uvpython'
@@ -1126,7 +1120,6 @@ pipeline {
11261120
}
11271121
environment{
11281122
PIP_CACHE_DIR='/tmp/pipcache'
1129-
UV_INDEX_STRATEGY='unsafe-best-match'
11301123
UV_CACHE_DIR='/tmp/uvcache'
11311124
UV_CONFIG_FILE=createUVConfig()
11321125
}
@@ -1194,7 +1187,6 @@ pipeline {
11941187
retry(3){
11951188
try{
11961189
withEnv([
1197-
"UV_INDEX_STRATEGY=unsafe-best-match",
11981190
"UV_CONFIG_FILE=${createUVConfig()}"
11991191
]){
12001192
timeout(60){
@@ -1240,7 +1232,6 @@ pipeline {
12401232
'UV_TOOL_DIR=C:\\Users\\ContainerUser\\Documents\\uvtools',
12411233
'UV_PYTHON_INSTALL_DIR=C:\\Users\\ContainerUser\\Documents\\uvpython',
12421234
'UV_CACHE_DIR=C:\\cache\\uvcache',
1243-
'UV_INDEX_STRATEGY=unsafe-best-match',
12441235
]){
12451236
def image
12461237
checkout scm
@@ -1320,7 +1311,6 @@ pipeline {
13201311
checkout scm
13211312
withEnv([
13221313
'PIP_CACHE_DIR=/tmp/pipcache',
1323-
'UV_INDEX_STRATEGY=unsafe-best-match',
13241314
'UV_TOOL_DIR=/tmp/uvtools',
13251315
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
13261316
'UV_CACHE_DIR=/tmp/uvcache',
@@ -1389,7 +1379,6 @@ pipeline {
13891379
stage('Deploy to pypi') {
13901380
environment{
13911381
PIP_CACHE_DIR='/tmp/pipcache'
1392-
UV_INDEX_STRATEGY='unsafe-best-match'
13931382
UV_TOOL_DIR='/tmp/uvtools'
13941383
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
13951384
UV_CACHE_DIR='/tmp/uvcache'
@@ -1431,7 +1420,6 @@ pipeline {
14311420
withEnv(
14321421
[
14331422
"TWINE_REPOSITORY_URL=${SERVER_URL}",
1434-
'UV_INDEX_STRATEGY=unsafe-best-match'
14351423
]
14361424
){
14371425
withCredentials(

‎scripts/build_mac_wheel.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ generate_wheel(){
5454
output_path="./dist"
5555
echo "Building wheel for Python $python_version on macOS $processor_type"
5656
trap "rm -rf $out_temp_wheels_dir" ERR SIGINT SIGTERM RETURN
57-
UV_INDEX_STRATEGY=unsafe-best-match _PYTHON_HOST_PLATFORM=$_PYTHON_HOST_PLATFORM MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET ARCHFLAGS=$ARCHFLAGS $uv_exec build --wheel --out-dir=$out_temp_wheels_dir --python=$python_version $project_root
57+
_PYTHON_HOST_PLATFORM=$_PYTHON_HOST_PLATFORM MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET ARCHFLAGS=$ARCHFLAGS $uv_exec build --wheel --out-dir=$out_temp_wheels_dir --python=$python_version $project_root
5858
pattern="$out_temp_wheels_dir/*.whl"
5959
files=( $pattern )
6060
undelocate_wheel="${files[0]}"

0 commit comments

Comments
 (0)