From 458ea0e0cf924585a84ae33d86d7220e256647a3 Mon Sep 17 00:00:00 2001 From: Patrick Avery Date: Fri, 13 Feb 2026 14:23:10 -0600 Subject: [PATCH 1/3] Set zlib paths manually so it will be found It's a strange issue that the zlib paths are not being found automatically. We should try removing it sometime. Signed-off-by: Patrick Avery --- .github/workflows/scripts/build_tomviz.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/scripts/build_tomviz.sh b/.github/workflows/scripts/build_tomviz.sh index 429a1ba0f..62a5a0238 100644 --- a/.github/workflows/scripts/build_tomviz.sh +++ b/.github/workflows/scripts/build_tomviz.sh @@ -1,10 +1,15 @@ #!/usr/bin/env bash mkdir -p tomviz-build && cd tomviz-build + +# FIXME: setting the zlib paths manually shouldn't be necessary forever. +# Try removing it sometime cmake -G"Ninja" -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DCMAKE_INSTALL_LIBDIR:STRING=lib \ -DTOMVIZ_USE_EXTERNAL_VTK:BOOL=ON \ -DENABLE_TESTING:BOOL=ON \ -DPython3_FIND_STRATEGY:STRING=LOCATION \ + -DZLIB_LIBRARY=$CONDA_PREFIX/lib/libz.so.1 \ + -DZLIB_INCLUDE_DIR=$CONDA_PREFIX/include \ ../tomviz ninja From 2245a3ff52bbda1a61d427f8e07926d7ab3eb2a0 Mon Sep 17 00:00:00 2001 From: Patrick Avery Date: Wed, 18 Feb 2026 09:43:14 -0600 Subject: [PATCH 2/3] Unpin tomviz acquisition requirements Signed-off-by: Patrick Avery --- acquisition/requirements-dev.txt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/acquisition/requirements-dev.txt b/acquisition/requirements-dev.txt index f583c9fc4..c70dbbc0a 100644 --- a/acquisition/requirements-dev.txt +++ b/acquisition/requirements-dev.txt @@ -1,10 +1,6 @@ -pytest>=8.3 -requests>=2.32.4 -Pillow==10.3.0 -# Need this for testing so we can stop there server, change when the required -# get into a release. -# https://github.com/bottlepy/bottle/archive/41ed6965.zip -bottle>=0.13.2 -mock==2.0.0 -diskcache==3.0.1 --e git+https://cjh1@bitbucket.org/cjh1/pydm3reader.git@filelike#egg=dm3_lib +pytest +requests +Pillow +bottle +mock +diskcache From aa832d267abc74b52d54b2eabb51c4b9e3c653eb Mon Sep 17 00:00:00 2001 From: Patrick Avery Date: Wed, 18 Feb 2026 11:42:10 -0600 Subject: [PATCH 3/3] Add setuptools to pyxrf requirements for testing This is required for Python3.11. Signed-off-by: Patrick Avery --- .github/workflows/pyxrf_requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pyxrf_requirements.txt b/.github/workflows/pyxrf_requirements.txt index e31436c51..b1219a925 100644 --- a/.github/workflows/pyxrf_requirements.txt +++ b/.github/workflows/pyxrf_requirements.txt @@ -11,3 +11,6 @@ hatchling # it gets fixed and a new release comes out. # See: https://github.com/NSLS-II-SRX/xrf-tomo/pull/10 pandas<3.0 +# This is required for running pyxrf-utils on Python3.11 +# Setuptools was removed in versions 80+ +setuptools<80