Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- update `version.py` to use `importlib` & fix tagless installation #2255 (#2269)
- 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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)|>= 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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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",
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/create_local_env_for_cil_development.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion scripts/requirements-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies:
- matplotlib-base >=3.3
- h5py
- pillow
- dxchange
- dxchange >=0.2.1
- olefile >=0.46
- pywavelets
- numba
Expand Down
2 changes: 1 addition & 1 deletion scripts/requirements-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies:
- matplotlib-base >=3.3
- h5py
- pillow
- dxchange
- dxchange >=0.2.1
- olefile >=0.46
- pywavelets
- numba
Expand Down
3 changes: 3 additions & 0 deletions test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import cil

print("CIL version:", cil.__version__)
Loading