Skip to content

Commit aa70eda

Browse files
committed
docs: mention rattler-build
1 parent 83e5399 commit aa70eda

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The jobs are:
1212
+ uses default (GitHub-hosted) runners to run tests on the min & max supported Python & NumPy versions
1313
+ `python -m unittest discover -v ./Wrappers/Python/test`
1414
- `conda`
15-
+ uses `conda-build` to build the conda package (saved as a build artifact named `cil-py3.m-OS`)
15+
+ uses `rattler-build` to build the conda package (saved as a build artifact named `conda-py3.m-OS`)
1616
- `docs`
1717
+ uses `docs/docs_environment.yml` plus `make -C docs` to build the documentation (saved as a build artifact named `DocumentationHTML`)
1818
+ renders to the `gh-pages` branch on `master` (nightly) pushes or on tag (release) pushes
@@ -39,12 +39,12 @@ When opening or modifying a pull request to `master`, two variants are built and
3939
> [!NOTE]
4040
> The action publishes `ccpi` as well as `https://tomography.stfc.ac.uk/conda/` conda channels. We will eventually move to conda-forge instead.
4141
42-
It looks for conda-build dependencies in the channels listed [here](./build.yml#L118). If you add any new dependencies, the appropriate channels need to be added to this line.
42+
It looks for dependencies in the channels listed in the `rattler-build-action`'s `build-args` [here](./build.yml). If you add any new dependencies, the appropriate channels need to be added to this line.
4343

4444
> [!TIP]
45-
> The `conda` job builds the `*.tar.bz2` package and uploads it as an artifact called `cil-py3.m-OS`.
45+
> The `conda` job builds the `*.conda` package and uploads it as an artifact called `conda-py3.m-OS`.
4646
> It can be found by going to the "Actions" tab, and selecting the appropriate run of `.github/workflows/build.yml`, or by clicking on the tick on the action in the "All checks have passed/failed" section of a PR. When viewing the "Summary" for the run of the action, there is an "Artifact" section at the bottom of the page.
47-
> Clicking on `cil-py3.m-OS` allows you to download a zip folder containing the `*.tar.bz2` file.
47+
> Clicking on `conda-py3.m-OS` allows you to download a zip folder containing the `*.conda` file.
4848
4949
### docs
5050

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
- Fixed behaviour of `ZeissDataReader` when negative values are passed in the ROI (#2244)
1212
- Fix `show2D` truncating plots when count is not a multiple of `num_cols` (#2315)
1313
- Dependencies:
14-
- olefile and dxchange are optional dependencies, instead of required (#2209)
14+
- `olefile` and `dxchange` are optional dependencies, instead of required (#2209, #2321)
15+
- fix missing `packaging` required dependency (#2321)
1516
- dxchange minimum version set to 0.2.1 to fix #2256 (#2268)
1617
- improve `tqdm` notebook support (#2241)
1718
- cvxpy version set to !=1.8.2 to fix #2303 (#2306)
@@ -25,6 +26,8 @@
2526
- Add prefix argument to TIFFStackReader to load a subset of TIFF files in
2627
a folder (#2239)
2728
- Update ASTRA interface to `direct_FP3D/BP3D` removing copies for GPU `ProjectionOperator` calls (#2134)
29+
- Testing:
30+
- migrate from `conda build` to `rattler-build`
2831

2932
* 25.0.0
3033
- New features:

0 commit comments

Comments
 (0)