Skip to content

Conversation

@gfardell
Copy link
Member

@gfardell gfardell commented May 8, 2025

Changes

This relaxes our numpy requirements as we don't need to build against a specific version.

I've added a convenience script that will build and test each version combination locally on windows or linux.

Follow-ups #2090 #2091 will recommend installing via environment files, or checking the tested version table.

Testing you performed

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

Related issues/links

closes #2092

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

@gfardell gfardell requested a review from a team as a code owner May 8, 2025 12:44
@gfardell gfardell marked this pull request as draft May 8, 2025 12:51
@gfardell gfardell changed the title Relax numpy Relax numpy versions May 8, 2025
@gfardell gfardell requested review from casperdcl and hrobarts May 8, 2025 17:02
@gfardell gfardell marked this pull request as ready for review May 8, 2025 17:03
Copy link
Contributor

@hrobarts hrobarts left a comment

Choose a reason for hiding this comment

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

Hi this looks useful to me so think it would be useful to have it somewhere shared, maybe could move it to the new build scripts repo? https://github.com/TomographicImaging/Build-scripts

Copy link
Member

@casperdcl casperdcl left a comment

Choose a reason for hiding this comment

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

just saw this; lgtm

@hrobarts hrobarts self-requested a review July 15, 2025 10:39
@hrobarts hrobarts merged commit 41845cd into TomographicImaging:master Jul 16, 2025
6 of 10 checks passed
@github-project-automation github-project-automation bot moved this from Todo to Done in CIL work Jul 16, 2025
casperdcl added a commit that referenced this pull request Aug 1, 2025
casperdcl added a commit that referenced this pull request Aug 5, 2025
- Fix failing CI due to redundant numpy builds no longer needed after #2156.
- Lightweight alternative to #2196
@casperdcl casperdcl mentioned this pull request Aug 5, 2025
casperdcl added a commit that referenced this pull request Aug 5, 2025
- fix failing CI due to redundant `numpy` builds (no longer needed after #2156)
- lightweight alternative to #2196
casperdcl added a commit that referenced this pull request Aug 14, 2025
- fix: test correct numpy version with `--extra-deps numpy=x.x` instead of `--numpy=x.x` (fixes #2156)
- fix: collect distributions in one job for upload & reindex (fixes #1918)
- optimise
  + share one build (per OS/Python version) across multiple numpy versions
  + per PR: min py/np version, ubuntu
  + `master`: min & max py/np, all OS
  + `tag` or `workflow_dispatch`: all versions, all OS
casperdcl added a commit that referenced this pull request Aug 14, 2025
- fix: test correct numpy version with `--extra-deps numpy=x.x` instead of `--numpy=x.x` (fixes #2156)
- fix: collect distributions in one job for upload & reindex (fixes #1918)
- optimise
  + share one build (per OS/Python version) across multiple numpy versions
  + per PR: min py/np version, ubuntu
  + `master`: min & max py/np, all OS
  + `tag` or `workflow_dispatch`: all versions, all OS
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

numpy version constraint

3 participants