Skip to content

Update pin on cvxpy version#2306

Open
lauramurgatroyd wants to merge 7 commits intomasterfrom
cvxpy_unpin
Open

Update pin on cvxpy version#2306
lauramurgatroyd wants to merge 7 commits intomasterfrom
cvxpy_unpin

Conversation

@lauramurgatroyd
Copy link
Copy Markdown
Member

@lauramurgatroyd lauramurgatroyd commented Apr 14, 2026

Description

Now that conda-forge/cvxpy-feedstock#125 has been merged, the new cvxpy versions which only work with numpy 2 and above, should have the appropriate requirement of numpy version, so we shouldn't have to pin the cvxpy version.
However, as a release of cvxpy = 1.8.2 exists without the correct numpy pin, we can't use that version.

We will need a separate PR to address https://github.com/TomographicImaging/CIL/ , after we support numpy2 : #2305

Example Usage

Contribution Notes

  • 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

Changes

Testing you performed

Please add any demo scripts to https://github.com/TomographicImaging/CIL-Demos/tree/main/misc

Trying to run all tests at: https://github.com/TomographicImaging/CIL/actions/runs/24447602072

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

@lauramurgatroyd
Copy link
Copy Markdown
Member Author

Hi @casperdcl do you think we'd have to patch the metadata of existing cvxpy releases to get this working, as suggested in this comment?
conda-forge/cvxpy-feedstock#125 (comment)

@casperdcl
Copy link
Copy Markdown
Member

oddly, our CI seems to be picking up conda-forge::cvxpy=1.8.2=py*_0 instead of conda-forge::cvxpy=1.8.2=py*_1.

@casperdcl
Copy link
Copy Markdown
Member

casperdcl commented Apr 14, 2026

ah of course, it'll see cvxpy=1.8.2=*_1 is incompatible with numpy<2 so will use the borked cvxpy=1.8.2=*_0 instead.

I suppose we need to have cvxpy!=1.8.2 in our conda environments at least until #2218 . pip requirements need no constraints.

@lauramurgatroyd
Copy link
Copy Markdown
Member Author

Ok, I'll update to: cvxpy!=1.8.2

@lauramurgatroyd lauramurgatroyd changed the title Remove pin on cvxpy version Update pin on cvxpy version Apr 15, 2026
@lauramurgatroyd lauramurgatroyd changed the title Update pin on cvxpy version Remove pin on cvxpy version Apr 15, 2026
@lauramurgatroyd lauramurgatroyd changed the title Remove pin on cvxpy version Update pin on cvxpy version Apr 15, 2026
Comment thread scripts/requirements-test-windows.yml Outdated
Co-authored-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
Signed-off-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
@lauramurgatroyd
Copy link
Copy Markdown
Member Author

It should be fine but I tried to run all tests but can't due to this issue: #2308 (comment)

https://github.com/TomographicImaging/CIL/actions/runs/24447602072

@lauramurgatroyd lauramurgatroyd marked this pull request as ready for review April 15, 2026 11:43
@lauramurgatroyd lauramurgatroyd requested a review from a team as a code owner April 15, 2026 11:43
Comment thread pyproject.toml Outdated
Co-authored-by: Casper da Costa-Luis <imaging@cdcl.ml>
Signed-off-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
Signed-off-by: Laura Murgatroyd <60604372+lauramurgatroyd@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: In Progress

Development

Successfully merging this pull request may close these issues.

2 participants