Skip to content

Unpin acquisition requirements #23

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
celiafish merged 3 commits into from
Feb 18, 2026
Merged

Unpin acquisition requirements #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
458ea0e
Set zlib paths manually so it will be found
psavery Feb 13, 2026
2245a3f
Unpin tomviz acquisition requirements
psavery Feb 18, 2026
aa832d2
Add setuptools to pyxrf requirements for testing
psavery Feb 18, 2026
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
3 changes: 3 additions & 0 deletions .github/workflows/pyxrf_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions .github/workflows/scripts/build_tomviz.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
16 changes: 6 additions & 10 deletions acquisition/requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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