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 the 4.x branch from the main branch #803

Merged
merged 100 commits into from
Jul 14, 2021
Merged

Update the 4.x branch from the main branch #803

merged 100 commits into from
Jul 14, 2021

Conversation

nfahlgren
Copy link
Member

Describe your changes
Synchronize updates in the main branch with the 4.x branch

DannieSheng and others added 30 commits June 8, 2021 10:35
Plot empirical cumulative distribution for object areas based on given mask
Update plantcv.hyperspectral.read_data to support BSQ in addition to BIL data formats
Create "ecdf" module in "visualize" subpackage.
remove previous functions
Co-authored-by: Noah Fahlgren <noahfahlgren@gmail.com>
Co-authored-by: Noah Fahlgren <noahfahlgren@gmail.com>
The codecov bash uploader seems to have broken. This may be because they are in the process of replacing it with a NodeJS uploader, so checking out a stable release may help
nfahlgren and others added 21 commits June 29, 2021 09:59
This is more of a test to see if this format meets the PEP257 requirements (see #782)
Add a module "ecdf" (Empirical Cumulative Distribution Function) to "visualize" sub-package
Also updated the configuration options for readability
Remark linting suggestions use somewhat different formatting than we have been using
…alues-improved

Match multiple metadata values - simpler approach
Changed import for watershed from skimage.morphology (which is being deprecated in an upcoming update) to skimage.segmentation
Update to requirements so that version of scikit required is compatible with the relocated watershed function
@nfahlgren nfahlgren added this to the PlantCV v4.x milestone Jul 14, 2021
@nfahlgren nfahlgren added this to In progress in PlantCV4 via automation Jul 14, 2021
@codecov
Copy link

codecov bot commented Jul 14, 2021

Codecov Report

Merging #803 (04bce8d) into 4.x (26681ae) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##               4.x      #803   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          138       139    +1     
  Lines         6313      6337   +24     
=========================================
+ Hits          6313      6337   +24     
Flag Coverage Δ
unittests 100.00% <100.00%> (ø)

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

Impacted Files Coverage Δ
plantcv/parallel/parsers.py 100.00% <100.00%> (ø)
plantcv/plantcv/fill.py 100.00% <100.00%> (ø)
plantcv/plantcv/hyperspectral/read_data.py 100.00% <100.00%> (ø)
plantcv/plantcv/rgb2gray_cmyk.py 100.00% <100.00%> (ø)
plantcv/plantcv/visualize/__init__.py 100.00% <100.00%> (ø)
plantcv/plantcv/visualize/obj_size_ecdf.py 100.00% <100.00%> (ø)
plantcv/plantcv/watershed.py 100.00% <100.00%> (ø)

@nfahlgren nfahlgren merged commit 9dc5f2f into 4.x Jul 14, 2021
PlantCV4 automation moved this from In progress to Done Jul 14, 2021
@nfahlgren nfahlgren deleted the update-4x branch July 14, 2021 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
PlantCV4
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

6 participants