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

bump everything #1778

Merged
merged 39 commits into from
Apr 23, 2024
Merged

bump everything #1778

merged 39 commits into from
Apr 23, 2024

Conversation

casperdcl
Copy link
Member

@casperdcl casperdcl commented Apr 16, 2024 •
edited

Changes

merged all of the following into one branch:

Testing you performed

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

gfardell and others added 30 commits February 16, 2024 17:11
@gfardell
Update cil recipes to use astra 2.1
86d3df4
@gfardell
callback temp fix
b13e7f6
@casperdcl
tests: fix windows tempfile race
79734b9
@gfardell
Merge remote-tracking branch 'upstream/master' into astra_2.1
52ab891
@gfardell
Merge remote-tracking branch 'upstream/test-windows-tempfile-race' in…
63cdc2c 
…to astra_2.1
@gfardell
changelog
f7602ee
@gfardell
Merge branch 'master' into astra_2.1
a092968
@gfardell
change back to conda-forge with cuda
7a29e25
@gfardell
update readme
20dcb83
@gfardell
Merge branch 'master' into astra_2.1
60b02e1 
Signed-off-by: Gemma Fardell <[email protected]>
@gfardell
Updated Dockerfile for new ASTRA version
a660e40
@gfardell
Updated requirements to TIGRE 2.6
c598a04
@gfardell
update recipe
03ffdeb
@gfardell
Update unittests for py3.12
223adbd
@gfardell
Merge branch 'master' into tigre_2.6
f1fce47
@gfardell
replace assertDictContainsSubset
f71918b
@gfardell
Merge branch 'master' into tigre_2.6
66b90b5
@gfardell
Update meta.yaml
45872b0 
and `__cuda` selector
@gfardell
Update meta.yaml
cf25d33 
added astra packages for GPU and non-CPU systems. Loosened version constraints in optional dependencies.
@casperdcl
CI: drop CUDA ASTRA
6287110
@casperdcl
CI: drop TIGRE CPU
e0a68ab
@casperdcl
docker: try -c nvidia
e7e8a13
@paskino @casperdcl
updates for CCPi-Regularisation version 24.0.0
7f95463
@paskino @casperdcl
add to changelog
bdc55dd
@casperdcl
bump ccpi-regulariser
fdc7a54
@casperdcl
CI: bump python, numpy versions
eb3649f
@gfardell
Supress prints for 3D fdk calls
2547db0
@gfardell
add versions, remove selector
e06231a
@gfardell
Merge remote-tracking branch 'origin/py_np_variants_update' into rgl24
3dc669a
@casperdcl
Merge branch 'astra_2.1' into bump-versions
14305b1
@casperdcl casperdcl changed the title octo-merge bump everything Apr 16, 2024
@gfardell
Copy link
Member

Passing! I Need to confirm builds with conda-build on linux & windows before we merge.

@casperdcl
Copy link
Member Author

Did you fix TIGRE? I didn't see a PR.

@casperdcl
Copy link
Member Author

casperdcl commented Apr 19, 2024 •
edited

Oh I see TomographicImaging/TIGRE-conda@0141368 directly pushed to master

@gfardell
Copy link
Member

Yeah, I build and upload manually so I uploaded them to test and then pushed after :)

@gfardell
Copy link
Member

Everything worked for me on windows and Linux! So I think we can merge and tag.

@gfardell
Update README.md
788cbc3 
Signed-off-by: Gemma Fardell <[email protected]>
@gfardell
Update cange log
9dee8c2 
Signed-off-by: Gemma Fardell <[email protected]>
lauramurgatroyd
lauramurgatroyd reviewed Apr 19, 2024
View reviewed changes
Copy link
Member

@lauramurgatroyd lauramurgatroyd left a comment

Choose a reason for hiding this comment

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

I looked at the documentation artifact, in the 1778_merge folder.
Is this the correct part to check?

I saw the tigre documentation was not rendered correctly there.

image

I am about to push a PR with some minor changes to changlelog and a readme

.github/workflows/build.yml
python-version: [3.9]
numpy-version: [1.22]
python-version: [3.11]
numpy-version: [1.25]
Copy link
Member

Choose a reason for hiding this comment

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

why were these particular versions chosen for the conda action?

CHANGELOG.md Show resolved Hide resolved
@lauramurgatroyd
Copy link
Member

Sorry I realise my above screenshot didnt properly demonstrate it but basically none of the tigre plugin was rendered

paskino
paskino reviewed Apr 19, 2024
View reviewed changes
recipe/meta.yaml
- astra-toolbox>=1.9.9.dev5,<2.1
- tigre=2.4
- ccpi-regulariser=22.0.0
- astra-toolbox>=1.9.9.dev5,<=2.1
Copy link
Contributor

Choose a reason for hiding this comment

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

are we happy with a range of ASTRA versions or do we want to pin to 2.1 only?

Copy link
Member

Choose a reason for hiding this comment

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

There's no interface changes between the two so I think it's ok. Backend changes are the user's responsibility.

paskino
paskino reviewed Apr 19, 2024
View reviewed changes
recipe/meta.yaml
- tigre=2.4
- ccpi-regulariser=22.0.0
- astra-toolbox>=1.9.9.dev5,<=2.1
- tigre>=2.4,<=2.6
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we accept a range of versions for TIGRE too?

Copy link
Member

Choose a reason for hiding this comment

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

There's no interface changes between the two so I think it's ok. Backend changes are the user's responsibility.

@paskino paskino mentioned this pull request Apr 22, 2024
Closed
3 tasks
@gfardell
Update test_DataProcessor.py
8f91c0e 
force jenkins

Signed-off-by: Gemma Fardell <[email protected]>
paskino
paskino reviewed Apr 23, 2024
View reviewed changes
README.md
- `tomophantom` can generate phantoms to use as test data [Tomophantom](https://github.com/dkazanc/TomoPhantom)
- `ipywidgets` enables visulisation tools within jupyter noteboooks
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder, shouldn't we need a table with versions requirements in the README?

@gfardell gfardell merged commit 5117e82 into master Apr 23, 2024
8 checks passed
@gfardell gfardell deleted the bump-versions branch April 23, 2024 09:05
@paskino paskino mentioned this pull request Apr 23, 2024
Closed
2 tasks
@gfardell gfardell mentioned this pull request Apr 23, 2024
Closed
4 tasks
@casperdcl casperdcl mentioned this pull request Apr 24, 2024
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paskino paskino paskino approved these changes

@gfardell gfardell gfardell left review comments

@lauramurgatroyd lauramurgatroyd lauramurgatroyd left review comments

Assignees
No one assigned
Labels
high_priority Waiting for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@casperdcl @gfardell @lauramurgatroyd @paskino