From 36e9811fff81cfa36ba0b5f4da386742ba1e2f61 Mon Sep 17 00:00:00 2001 From: Jeppe Klitgaard Date: Wed, 28 Jan 2026 13:11:10 +0000 Subject: [PATCH 1/4] fix: constrain dxchange version to fix ZeissDataReader --- README.md | 2 +- pyproject.toml | 2 +- recipe/meta.yaml | 2 +- scripts/create_local_env_for_cil_development.sh | 2 +- scripts/requirements-test-windows.yml | 2 +- scripts/requirements-test.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9a9149b869..a110ef8ad3 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ While building the CIL package we test with specific versions of dependencies. T |[zenodo_get](https://github.com/dvolgyes/zenodo_get)|>= 1.6|`zenodo_get>=1.6`| Downloads datasets from Zenodo, is used by `dataexample` to get data used in CIL-Demos |[AGPL-3.0](https://github.com/dvolgyes/zenodo_get?tab=AGPL-3.0-1-ov-file)| |--|--| **CT data readers** |--|--| |[olefile](https://github.com/decalage2/olefile)|>= 0.46|`olefile>=0.46`|Package to process Microsoft OLE2 files, used to read ZEISS data files.|[BSD-style (custom)](https://github.com/decalage2/olefile?tab=License-1-ov-file)| -|[dxchange](https://github.com/data-exchange/dxchange)||`dxchange`|Provides an interface with TomoPy for loading tomography data.|[BSD-style (custom)](https://github.com/data-exchange/dxchange?tab=License-1-ov-file)| +|[dxchange](https://github.com/data-exchange/dxchange)||`dxchange>=0.2.1`|Provides an interface with TomoPy for loading tomography data.|[BSD-style (custom)](https://github.com/data-exchange/dxchange?tab=License-1-ov-file)| ### Docker diff --git a/pyproject.toml b/pyproject.toml index 499858c6d8..e963624de6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ readme = "README.md" keywords = ["tomography", "optimisation"] dependencies = [ #"cil-data>=22", # missing from PyPI - "dxchange", + "dxchange>=0.2.1", # Minimal release for OLE dtype fix: https://github.com/data-exchange/dxchange/pull/124#issue-3828961474 "h5py", #"ipp==2021.12.*", # PyPI conflicts with conda package "numba", diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ebecb34f75..24d414883f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,7 @@ test: - astra-toolbox 2.1 {{ 'cuda*' if environ.get('TESTS_FORCE_GPU', '') else 'py*' }} - matplotlib-base >=3.3 - zenodo_get >=1.6 - - dxchange + - dxchange >= 0.2.1 - olefile >=0.46 source_files: diff --git a/scripts/create_local_env_for_cil_development.sh b/scripts/create_local_env_for_cil_development.sh index 36c473b381..32515ff74b 100755 --- a/scripts/create_local_env_for_cil_development.sh +++ b/scripts/create_local_env_for_cil_development.sh @@ -49,7 +49,7 @@ conda_args=(create --name="$name" python="$python" numpy="$numpy" cmake'>=3.16' - dxchange + dxchange'>=0.2.1' h5py llvm-openmp ipp'>=2021.10' diff --git a/scripts/requirements-test-windows.yml b/scripts/requirements-test-windows.yml index 616db62ee9..2bfa84824f 100644 --- a/scripts/requirements-test-windows.yml +++ b/scripts/requirements-test-windows.yml @@ -38,7 +38,7 @@ dependencies: - matplotlib-base >=3.3 - h5py - pillow - - dxchange + - dxchange >=0.2.1 - olefile >=0.46 - pywavelets - numba diff --git a/scripts/requirements-test.yml b/scripts/requirements-test.yml index 496c19b3ad..a68116b2c2 100644 --- a/scripts/requirements-test.yml +++ b/scripts/requirements-test.yml @@ -39,7 +39,7 @@ dependencies: - matplotlib-base >=3.3 - h5py - pillow - - dxchange + - dxchange >=0.2.1 - olefile >=0.46 - pywavelets - numba From 0512fcfa0d1bf3b2205082942ad5de8234e81cf7 Mon Sep 17 00:00:00 2001 From: Jeppe Klitgaard Date: Wed, 28 Jan 2026 14:52:30 +0100 Subject: [PATCH 2/4] Update README.md Co-authored-by: Casper da Costa-Luis Signed-off-by: Jeppe Klitgaard --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a110ef8ad3..37b375021f 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ While building the CIL package we test with specific versions of dependencies. T |[zenodo_get](https://github.com/dvolgyes/zenodo_get)|>= 1.6|`zenodo_get>=1.6`| Downloads datasets from Zenodo, is used by `dataexample` to get data used in CIL-Demos |[AGPL-3.0](https://github.com/dvolgyes/zenodo_get?tab=AGPL-3.0-1-ov-file)| |--|--| **CT data readers** |--|--| |[olefile](https://github.com/decalage2/olefile)|>= 0.46|`olefile>=0.46`|Package to process Microsoft OLE2 files, used to read ZEISS data files.|[BSD-style (custom)](https://github.com/decalage2/olefile?tab=License-1-ov-file)| -|[dxchange](https://github.com/data-exchange/dxchange)||`dxchange>=0.2.1`|Provides an interface with TomoPy for loading tomography data.|[BSD-style (custom)](https://github.com/data-exchange/dxchange?tab=License-1-ov-file)| +|[dxchange](https://github.com/data-exchange/dxchange)|>= 0.2.1|`dxchange>=0.2.1`|Provides an interface with TomoPy for loading tomography data.|[BSD-style (custom)](https://github.com/data-exchange/dxchange?tab=License-1-ov-file)| ### Docker From 36ae7d530b745444fc8707e8972f6803c1476a7a Mon Sep 17 00:00:00 2001 From: Jeppe Klitgaard Date: Wed, 28 Jan 2026 14:00:53 +0000 Subject: [PATCH 3/4] docs: changelog for dxchange constraint --- test.py | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test.py diff --git a/test.py b/test.py new file mode 100644 index 0000000000..3d12d1df42 --- /dev/null +++ b/test.py @@ -0,0 +1,3 @@ +import cil + +print("CIL version:", cil.__version__) \ No newline at end of file From b5468ec73900d253a35a19677cfc0f3f6b9096a5 Mon Sep 17 00:00:00 2001 From: Jeppe Klitgaard Date: Wed, 28 Jan 2026 14:01:58 +0000 Subject: [PATCH 4/4] docs: changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e37f618d58..ff2c085b4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - `PaganinProcessor` now correctly applies scaling with magnification for cone-beam geometry (#2225) - Dependencies: - olefile and dxchange are optional dependencies, instead of required (#2209) + - dxchange minimum version set to 0.2.1 to fix #2256 (#2268) - improve `tqdm` notebook support (#2241) - Documentation: - Render the user showcase notebooks in the documentation (#2189)