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.

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

Fixes issue TestQualityMeasures' object has no attribute 'id_coins_sliced' #1710 #1711

Merged
merged 5 commits into from
Feb 15, 2024

Conversation

MargaretDuff
Copy link
Member

@MargaretDuff MargaretDuff commented Feb 15, 2024

Describe your changes

Added skip if no scipy to the new tests

Describe any testing you have performed

Please add any demo scripts to CIL-Demos/misc/

Link relevant issues

Closes #1710

Checklist when you are ready to request a review

  • I have performed a self-review of my code
  • I have added docstrings in line with the guidance in the developer guide
  • 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

@MargaretDuff MargaretDuff self-assigned this Feb 15, 2024
@MargaretDuff MargaretDuff added Waiting for review bug Something isn't working labels Feb 15, 2024
Copy link
Contributor

@paskino paskino left a comment

Choose a reason for hiding this comment

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

Looks good to me.
I guess we could skip the whole class with one skipIf above the class definition, but I haven't tested it.

I fixed the build issue on SIRF by not running this test in SIRF-SuperBuild paskino/SIRF-SuperBuild@c017a59

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.

btw, why isn't scikit-image a hard dependency?

@MargaretDuff
Copy link
Member Author

btw, why isn't scikit-image a hard dependency?

I don't know - is it used elsewhere in CIL? If it is automatically installed with the CIL conda build I presume the skip decorator was there for SIRF reasons?

@paskino
Copy link
Contributor

paskino commented Feb 15, 2024

btw, why isn't scikit-image a hard dependency?

because we only need it for this test.

@KrisThielemans
Copy link
Contributor

Does this mean we can add scikit-image just to run the tests.

We have
https://github.com/SyneRBI/SIRF-SuperBuild/blob/master/docker/requirements-travis.txt
(surely to be renamed) where this could be added. conda recipes allow you to specify this, but for the SuperBuild, we have to do this by hand. Obviously, ideally the SIRF-SuperBuild would get this information from CIL, but that isn't so easy to set-up. SyneRBI/SIRF-SuperBuild#493

@paskino
Copy link
Contributor

paskino commented Feb 15, 2024

@KrisThielemans this PR fixes the unittest if scikit-image isn't installed. Once we tag the new CIL release (probably next week? @gfardell ) we can then remove the added scikit-image from the SuperBuild requirements.txt

@paskino paskino enabled auto-merge (squash) February 15, 2024 17:07
@paskino paskino disabled auto-merge February 15, 2024 17:07
@paskino paskino merged commit 00bf936 into TomographicImaging:master Feb 15, 2024
3 checks passed
@KrisThielemans
Copy link
Contributor

Once we tag the new CIL release (probably next week? @gfardell ) we can then remove the added scikit-image from the SuperBuild requirements.txt

why would we? If it's installed, the test will run, which has to be a good thing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working Waiting for review
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

TestQualityMeasures' object has no attribute 'id_coins_sliced'
4 participants