Skip to content

Dev #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henryborchers merged 2 commits into from
Dec 18, 2025
Merged

Dev #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fa4dc3
ci: remove all usage of unsafe-best-match
henryborchers Dec 16, 2025
94cdac3
build: support python 3.14 and 3.14t
henryborchers Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ library identifier: 'JenkinsPythonHelperLibrary@2024.2.0', retriever: modernSCM(
])


def SUPPORTED_MAC_VERSIONS = ['3.10', '3.11', '3.12', '3.13']
def SUPPORTED_LINUX_VERSIONS = ['3.10', '3.11', '3.12', '3.13']
def SUPPORTED_WINDOWS_VERSIONS = ['3.10', '3.11', '3.12', '3.13']
def SUPPORTED_MAC_VERSIONS = ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
def SUPPORTED_LINUX_VERSIONS = ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
def SUPPORTED_WINDOWS_VERSIONS = ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
def SHARED_PIP_CACHE_VOLUME_NAME = 'pipcache'
def installMSVCRuntime(cacheLocation){
def cachedFile = "${cacheLocation}\\vc_redist.x64.exe".replaceAll(/\\\\+/, '\\\\')
Expand Down Expand Up @@ -267,7 +267,6 @@ def windows_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPip
'UV_TOOL_DIR=C:\\Users\\ContainerUser\\Documents\\uvtools',
'UV_PYTHON_INSTALL_DIR=C:\\Users\\ContainerUser\\Documents\\uvpython',
'UV_CACHE_DIR=C:\\Users\\ContainerUser\\Documents\\uvcache',
'UV_INDEX_STRATEGY=unsafe-best-match',
]){
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}"){
installMSVCRuntime('c:\\msvc_runtime\\')
Expand Down Expand Up @@ -350,7 +349,6 @@ def linux_wheels(pythonVersions, testPackages, params, wheelStashes, sharedPipCa
try{
withEnv([
'PIP_CACHE_DIR=/tmp/pipcache',
'UV_INDEX_STRATEGY=unsafe-best-match',
'UV_TOOL_DIR=/tmp/uvtools',
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
'UV_CACHE_DIR=/tmp/uvcache',
Expand Down Expand Up @@ -451,7 +449,6 @@ pipeline {
}
environment{
PIP_CACHE_DIR='/tmp/pipcache'
UV_INDEX_STRATEGY='unsafe-best-match'
UV_TOOL_DIR='/tmp/uvtools'
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
UV_CACHE_DIR='/tmp/uvcache'
Expand Down Expand Up @@ -837,7 +834,6 @@ pipeline {
stage('Linux'){
environment{
PIP_CACHE_DIR='/tmp/docker_cache/.cache/pip'
UV_INDEX_STRATEGY='unsafe-best-match'
UV_TOOL_DIR='/tmp/uvtools'
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
UV_CACHE_DIR='/tmp/uvcache'
Expand Down Expand Up @@ -913,7 +909,6 @@ pipeline {
expression {return nodesByLabel('windows && docker && x86').size() > 0}
}
environment{
UV_INDEX_STRATEGY='unsafe-best-match'
PIP_CACHE_DIR='C:\\Users\\ContainerUser\\Documents\\pipcache'
UV_TOOL_DIR='C:\\Users\\ContainerUser\\Documents\\uvtools'
UV_PYTHON_INSTALL_DIR='C:\\Users\\ContainerUser\\Documents\\uvpython'
Expand Down Expand Up @@ -1033,7 +1028,6 @@ pipeline {
}
environment{
PIP_CACHE_DIR='/tmp/pipcache'
UV_INDEX_STRATEGY='unsafe-best-match'
UV_CACHE_DIR='/tmp/uvcache'
}
steps{
Expand Down Expand Up @@ -1093,7 +1087,7 @@ pipeline {
sh(label: 'Running Tox',
script: """python${pythonVersion} -m venv venv
venv/bin/python -m pip install --disable-pip-version-check uv
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('.', '')}
CONAN_REVISIONS_ENABLED=1 venv/bin/uv run --only-group tox --with tox-uv tox run --installpkg ${it.path} -e py${pythonVersion.replace('.', '')}
rm -rf ./.tox
rm -rf ./venv
"""
Expand Down Expand Up @@ -1195,7 +1189,6 @@ pipeline {
testCommand: {
withEnv([
'PIP_CACHE_DIR=/tmp/pipcache',
'UV_INDEX_STRATEGY=unsafe-best-match',
'UV_TOOL_DIR=/tmp/uvtools',
'UV_PYTHON_INSTALL_DIR=/tmp/uvpython',
'UV_CACHE_DIR=/tmp/uvcache',
Expand Down Expand Up @@ -1247,7 +1240,6 @@ pipeline {
stage('Deploy to pypi') {
environment{
PIP_CACHE_DIR='/tmp/pipcache'
UV_INDEX_STRATEGY='unsafe-best-match'
UV_TOOL_DIR='/tmp/uvtools'
UV_PYTHON_INSTALL_DIR='/tmp/uvpython'
UV_CACHE_DIR='/tmp/uvcache'
Expand Down Expand Up @@ -1289,7 +1281,6 @@ pipeline {
withEnv(
[
"TWINE_REPOSITORY_URL=${SERVER_URL}",
'UV_INDEX_STRATEGY=unsafe-best-match'
]
){
withCredentials(
Expand Down
3 changes: 3 additions & 0 deletions ci/docker/linux/tox/apt-packages.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@ python3.12-dev
python3.12-venv
python3.13-dev
python3.13-venv
python3.14-dev
python3.14-venv
python3.14-nogil
git
jq
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ build-backend = "uiucprescon.build"
name = "uiucprescon.imagevalidate"
version = "0.1.10.dev4"
dependencies = [
"py3exiv2bind>=0.1.9"
"py3exiv2bind>=0.1.15"
]
requires-python = ">=3.10"
readme = "README.rst"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_mac_wheel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ generate_wheel_with_uv(){
out_temp_wheels_dir=$(mktemp -d /tmp/python_wheels.XXXXXX)
output_path="./dist"
trap "rm -rf $out_temp_wheels_dir" ERR SIGINT SIGTERM RETURN
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
_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
pattern="$out_temp_wheels_dir/*.whl"
files=( $pattern )
undelocate_wheel="${files[0]}"
Expand Down
1 change: 0 additions & 1 deletion scripts/resources/windows/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ RUN New-Item -type directory -path ${Env:PIP_DOWNLOAD_CACHE} -Force | Out-Null ;

ENV CONAN_USER_HOME=${CONAN_USER_HOME}`
CONAN_HOME=${CONAN_HOME}`
UV_INDEX_STRATEGY=unsafe-best-match`
UV_CACHE_DIR=${UV_CACHE_DIR}`
PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE}

Expand Down
2 changes: 1 addition & 1 deletion src/uiucprescon/imagevalidate/openjp2wrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <pybind11/pybind11.h>

//NOLINTNEXTLINE
PYBIND11_MODULE(openjp2wrap, m){ // cppcheck-suppress unusedFunction
PYBIND11_MODULE(openjp2wrap, m, pybind11::mod_gil_not_used()){ // cppcheck-suppress unusedFunction
pybind11::options options;
options.enable_function_signatures();
m.def("open_jpeg_version", &open_jpeg_version, "Get the version of OpenJPEG built with");
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py310, py311, py312, py313
envlist = py310, py311, py312, py313, py314, py314t
min_version = 4.11

[testenv]
Expand Down
Loading