Skip to content
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

Jump to bottom

Update CCPi-Regularisation plugin for version 24.0.0 #1761

Closed
wants to merge 8 commits into from
Closed

Update CCPi-Regularisation plugin for version 24.0.0 #1761

wants to merge 8 commits into from
+117 −110

Conversation

paskino
Copy link
Contributor

@paskino paskino commented Mar 27, 2024 •
edited by casperdcl
Loading

Changes

This contains the changes required for version 24.0.0 of the CCPi-Regularisation toolkit after TomographicImaging/CCPi-Regularisation-Toolkit#183

Testing you performed

Updated CIL's Regularisation toolkit unittests

Related issues/links

Checklist

  • I have performed a self-review of my code
  • I have added docstrings in line with the guidance in the developer guide
  • I have updated the relevant documentation
  • I have implemented unit tests that cover any new or modified functionality
  • CHANGELOG.md has been updated with any functionality change
  • Request review from all relevant developers
  • Change pull request label to 'Waiting for review'

Contribution Notes

Please read and adhere to the developer guide and local patterns and conventions.

  • The content of this Pull Request (the Contribution) is intentionally submitted for inclusion in CIL (the Work) under the terms and conditions of the Apache-2.0 License
  • I confirm that the contribution does not violate any intellectual property rights of third parties

@paskino paskino requested review from casperdcl and gfardell March 27, 2024 16:50
@paskino paskino changed the title updates for CCPi-Regularisation version 24.0.0 Update CCPi-Regularisation plugin for version 24.0.0 Mar 27, 2024
@gfardell
Copy link
Member

I think it needs to include the recipe changes before it goes in - so waiting on the release of the toolkit.

Is it tested on windows?

@gfardell gfardell mentioned this pull request Mar 28, 2024
Closed
15 tasks
@casperdcl casperdcl marked this pull request as ready for review April 16, 2024 12:58
casperdcl
casperdcl reviewed Apr 16, 2024
View reviewed changes
Copy link
Member

@casperdcl casperdcl left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/blob/master/recipe/conda_build_config.yaml requires python>=3.10123

should we drop python<3.10 in CIL too?

Footnotes

  1. https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/pull/200 ↩

  2. https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit/issues/194 ↩

  3. CIL v24 supported py and np versions #1719 ↩

@casperdcl
Copy link
Member

casperdcl commented Apr 16, 2024 •
edited
Loading

now failing because astra-toolbox needs to be at least 2.1.0 (#1713)

casperdcl added a commit that referenced this pull request Apr 16, 2024
@casperdcl
octo-merge
9014c4f 
- closes #1713 bump astra
- closes #1764 bump tigre
- closes #1761 bump ccpi-regulariser
- closes #1765 bumpy python & numpy
@casperdcl casperdcl mentioned this pull request Apr 16, 2024
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@casperdcl casperdcl casperdcl left review comments

@gfardell gfardell Awaiting requested review from gfardell

Assignees

@casperdcl casperdcl

@paskino paskino

Labels
Waiting for review
Projects
No open projects
Work plan
Status: PRs to review
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update CIL RGL Toolkit dependency to v24
3 participants
@paskino @gfardell @casperdcl