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 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 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