Skip to content

Commit e0605e5

Browse files
henryborchershenryborchers
authored
Merge pull request #165 from UIUCLibrary/dev
Dev
2 parents a5f610f + 94cdac3 commit e0605e5

File tree

8 files changed

+51
-46
lines changed

8 files changed

+51
-46
lines changed

‎Jenkinsfile‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ library identifier: '[email protected]', retriever: modernSCM(
55
])
66

77

8-
def SUPPORTED_MAC_VERSIONS = ['3.10', '3.11', '3.12', '3.13']
9-
def SUPPORTED_LINUX_VERSIONS = ['3.10', '3.11', '3.12', '3.13']
10-
def SUPPORTED_WINDOWS_VERSIONS = ['3.10', '3.11', '3.12', '3.13']
8+
def SUPPORTED_MAC_VERSIONS = ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
9+
def SUPPORTED_LINUX_VERSIONS = ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
10+
def SUPPORTED_WINDOWS_VERSIONS = ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
1111
def SHARED_PIP_CACHE_VOLUME_NAME = 'pipcache'
1212
def installMSVCRuntime(cacheLocation){
1313
def cachedFile = "${cacheLocation}\\vc_redist.x64.exe".replaceAll(/\\\\+/, '\\\\')
@@ -267,7 +267,6 @@ def windows_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPip
267267
'UV_TOOL_DIR=C:\\Users\\ContainerUser\\Documents\\uvtools',
268268
'UV_PYTHON_INSTALL_DIR=C:\\Users\\ContainerUser\\Documents\\uvpython',
269269
'UV_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\uvcache',
270-
'UV_INDEX_STRATEGY=unsafe-best-match',
271270
]){
272271
docker.image(env.DEFAULT_PYTHON_DOCKER_IMAGE ? env.DEFAULT_PYTHON_DOCKER_IMAGE: 'python').inside("--mount source=uv_python_install_dir,target=C:\\Users\\ContainerUser\\Documents\\uvpython --mount source=msvc-runtime,target=c:\\msvc_runtime --mount source=${sharedPipCacheVolumeName},target=${env:PIP_CACHE_DIR}"){
273272
installMSVCRuntime('c:\\msvc_runtime\\')
@@ -350,7 +349,6 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPipCa
350349
try{
351350
withEnv([
352351
'PIP_CACHE_DIR=/tmp/pipcache',
353-
'UV_INDEX_STRATEGY=unsafe-best-match',
354352
'UV_TOOL_DIR=/tmp/uvtools',
355353
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
356354
'UV_CACHE_DIR=/tmp/uvcache',
@@ -451,7 +449,6 @@ pipeline {
451449
}
452450
environment{
453451
PIP_CACHE_DIR='/tmp/pipcache'
454-
UV_INDEX_STRATEGY='unsafe-best-match'
455452
UV_TOOL_DIR='/tmp/uvtools'
456453
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
457454
UV_CACHE_DIR='/tmp/uvcache'
@@ -837,7 +834,6 @@ pipeline {
837834
stage('Linux'){
838835
environment{
839836
PIP_CACHE_DIR='/tmp/docker_cache/.cache/pip'
840-
UV_INDEX_STRATEGY='unsafe-best-match'
841837
UV_TOOL_DIR='/tmp/uvtools'
842838
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
843839
UV_CACHE_DIR='/tmp/uvcache'
@@ -913,7 +909,6 @@ pipeline {
913909
expression {return nodesByLabel('windows && docker && x86').size() > 0}
914910
}
915911
environment{
916-
UV_INDEX_STRATEGY='unsafe-best-match'
917912
PIP_CACHE_DIR='C:\\Users\\ContainerUser\\Documents\\pipcache'
918913
UV_TOOL_DIR='C:\\Users\\ContainerUser\\Documents\\uvtools'
919914
UV_PYTHON_INSTALL_DIR='C:\\Users\\ContainerUser\\Documents\\uvpython'
@@ -1033,7 +1028,6 @@ pipeline {
10331028
}
10341029
environment{
10351030
PIP_CACHE_DIR='/tmp/pipcache'
1036-
UV_INDEX_STRATEGY='unsafe-best-match'
10371031
UV_CACHE_DIR='/tmp/uvcache'
10381032
}
10391033
steps{
@@ -1093,7 +1087,7 @@ pipeline {
10931087
sh(label: 'Running Tox',
10941088
script: """python${pythonVersion} -m venv venv
10951089
venv/bin/python -m pip install --disable-pip-version-check uv
1096-
UV_INDEX_STRATEGY=unsafe-best-match CONAN_REVISIONS_ENABLED=1 venv/bin/uv run --only-group tox --with tox-uv tox run --installpkg ${it.path} -e py${pythonVersion.replace('.', '')}
1090+
CONAN_REVISIONS_ENABLED=1 venv/bin/uv run --only-group tox --with tox-uv tox run --installpkg ${it.path} -e py${pythonVersion.replace('.', '')}
10971091
rm -rf ./.tox
10981092
rm -rf ./venv
10991093
"""
@@ -1195,7 +1189,6 @@ pipeline {
11951189
testCommand: {
11961190
withEnv([
11971191
'PIP_CACHE_DIR=/tmp/pipcache',
1198-
'UV_INDEX_STRATEGY=unsafe-best-match',
11991192
'UV_TOOL_DIR=/tmp/uvtools',
12001193
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
12011194
'UV_CACHE_DIR=/tmp/uvcache',
@@ -1247,7 +1240,6 @@ pipeline {
12471240
stage('Deploy to pypi') {
12481241
environment{
12491242
PIP_CACHE_DIR='/tmp/pipcache'
1250-
UV_INDEX_STRATEGY='unsafe-best-match'
12511243
UV_TOOL_DIR='/tmp/uvtools'
12521244
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
12531245
UV_CACHE_DIR='/tmp/uvcache'
@@ -1289,7 +1281,6 @@ pipeline {
12891281
withEnv(
12901282
[
12911283
"TWINE_REPOSITORY_URL=${SERVER_URL}",
1292-
'UV_INDEX_STRATEGY=unsafe-best-match'
12931284
]
12941285
){
12951286
withCredentials(

‎ci/docker/linux/tox/apt-packages.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ python3.12-dev
88
python3.12-venv
99
python3.13-dev
1010
python3.13-venv
11+
python3.14-dev
12+
python3.14-venv
13+
python3.14-nogil
1114
git
1215
jq

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ build-backend = "uiucprescon.build"
1515
name = "uiucprescon.imagevalidate"
1616
version = "0.1.10.dev4"
1717
dependencies = [
18-
"py3exiv2bind>=0.1.9"
18+
"py3exiv2bind>=0.1.15"
1919
]
2020
requires-python = ">=3.10"
2121
readme = "README.rst"

‎scripts/build_mac_wheel.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ generate_wheel_with_uv(){
4646
out_temp_wheels_dir=$(mktemp -d /tmp/python_wheels.XXXXXX)
4747
output_path="./dist"
4848
trap "rm -rf $out_temp_wheels_dir" ERR SIGINT SIGTERM RETURN
49-
UV_INDEX_STRATEGY=unsafe-best-match _PYTHON_HOST_PLATFORM=$_PYTHON_HOST_PLATFORM MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET ARCHFLAGS=$ARCHFLAGS $uv build --python=$pythonVersion --wheel --out-dir=$out_temp_wheels_dir $project_root
49+
_PYTHON_HOST_PLATFORM=$_PYTHON_HOST_PLATFORM MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET ARCHFLAGS=$ARCHFLAGS $uv build --python=$pythonVersion --wheel --out-dir=$out_temp_wheels_dir $project_root
5050
pattern="$out_temp_wheels_dir/*.whl"
5151
files=( $pattern )
5252
undelocate_wheel="${files[0]}"

‎scripts/resources/windows/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ RUN New-Item -type directory -path ${Env:PIP_DOWNLOAD_CACHE} -Force | Out-Null ;
108108

109109
ENV CONAN_USER_HOME=${CONAN_USER_HOME}`
110110
CONAN_HOME=${CONAN_HOME}`
111-
UV_INDEX_STRATEGY=unsafe-best-match`
112111
UV_CACHE_DIR=${UV_CACHE_DIR}`
113112
PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE}
114113

‎src/uiucprescon/imagevalidate/openjp2wrap.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <pybind11/pybind11.h>
55

66
//NOLINTNEXTLINE
7-
PYBIND11_MODULE(openjp2wrap, m){ // cppcheck-suppress unusedFunction
7+
PYBIND11_MODULE(openjp2wrap, m, pybind11::mod_gil_not_used()){ // cppcheck-suppress unusedFunction
88
pybind11::options options;
99
options.enable_function_signatures();
1010
m.def("open_jpeg_version", &open_jpeg_version, "Get the version of OpenJPEG built with");

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py310, py311, py312, py313
2+
envlist = py310, py311, py312, py313, py314, py314t
33
min_version = 4.11
44

55
[testenv]

0 commit comments

Comments
 (0)