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

Update release 4.0 #1004

Merged
merged 29 commits into from
Mar 15, 2023
Merged

Update release 4.0 #1004

merged 29 commits into from
Mar 15, 2023

Conversation

HaleySchuhl
Copy link
Contributor

Describe your changes
Update the release_4.0 branch to pull down changes regarding python and scikit image versions. (#998 )

Type of update
Is this a:

  • Bug fix
  • New feature or feature enhancement
  • Update to documentation
  • Work in progress

Associated issues
Reference associated issue numbers. Does this pull request close any issues?

Additional context
Add any other context about the problem here.

For the reviewer
See this page for instructions on how to review the pull request.

  • PR functionality reviewed in a Jupyter Notebook
  • All tests pass
  • Test coverage remains 100%
  • Documentation tested
  • New documentation pages added to plantcv/mkdocs.yml
  • Changes to function input/output signatures added to updating.md
  • Code reviewed
  • PR approved

HaleySchuhl and others added 29 commits August 12, 2022 15:38
tweak documentation to reflect the simplified functionality, and include parameter names in examples
Added compatibility for BIP data format of hsi images in read_image
Co-authored-by: Noah Fahlgren <noahfahlgren@gmail.com>
…e-update

Morphology segment combine update
Threw error when img was just black (only zeros) and broke workflows
…on name

This commit updates the requirements.txt file and replaces the use of
the deprecated function name 'greycomatrix' with 'graycomatrix' in
`threshold_methods.py`. The change in function name in skimage.feature
from version 0.19 caused an ImportError when importing plantcv, which is
resolved with this commit.
In skimage>=0.19, the `peak_local_max` function no longer takes the
`indices` argument. This adds two lines to compute the indices after
getting the local max coordinates.
Fix ImportError in plantcv caused by change in skimage.feature function name
Fixed check for binary image
@HaleySchuhl HaleySchuhl self-assigned this Mar 14, 2023
@HaleySchuhl HaleySchuhl added the update Updates an existing feature/method label Mar 14, 2023
@HaleySchuhl HaleySchuhl added this to In progress in PlantCV3 via automation Mar 14, 2023
@HaleySchuhl HaleySchuhl added this to Pull Requests in PlantCV4 via automation Mar 14, 2023
@HaleySchuhl HaleySchuhl added this to the PlantCV v4.0 milestone Mar 14, 2023
@codecov
Copy link

codecov bot commented Mar 14, 2023

Codecov Report

Merging #1004 (812ec6f) into release-4.0 (04d8ae5) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #1004      +/-   ##
===============================================
- Coverage       100.00%   99.98%   -0.02%     
===============================================
  Files              147      161      +14     
  Lines             6640     6849     +209     
===============================================
+ Hits              6640     6848     +208     
- Misses               0        1       +1     
Flag Coverage Δ
unittests 99.98% <100.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
plantcv/plantcv/hyperspectral/read_data.py 100.00% <ø> (ø)
plantcv/plantcv/closing.py 100.00% <100.00%> (ø)
plantcv/plantcv/fill.py 100.00% <100.00%> (ø)
plantcv/plantcv/morphology/segment_combine.py 100.00% <100.00%> (ø)
plantcv/plantcv/threshold/threshold_methods.py 100.00% <100.00%> (ø)
plantcv/plantcv/watershed.py 100.00% <100.00%> (ø)

... and 16 files with indirect coverage changes

@nfahlgren nfahlgren merged commit 03829b2 into release-4.0 Mar 15, 2023
PlantCV3 automation moved this from In progress to Done Mar 15, 2023
PlantCV4 automation moved this from Pull Requests to Done Mar 15, 2023
@nfahlgren nfahlgren deleted the update_release_4.0 branch March 15, 2023 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
update Updates an existing feature/method
Projects
PlantCV4
  
Done
PlantCV3
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants