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

Unbreak master #1148

Merged
merged 5 commits into from
Apr 8, 2019
Merged

Unbreak master #1148

merged 5 commits into from
Apr 8, 2019

Conversation

ttung
Copy link
Collaborator

@ttung ttung commented Apr 8, 2019

  1. Normalize the run(..) method with the contract specified in SpotFinderAlgorithmBase.
  2. Flag an error if someone tries to specify a blobs_image with LocalSearchBlobDetector.
  3. Temporarily provide a image_to_spots method which the SpotFinderAlgorithmBase requires.

Test plan: make -j fast

1. Normalize the run(..) method with the contract specified in SpotFinderAlgorithmBase.
2. Flag an error if someone tries to specify a blobs_image with LocalSearchBlobDetector.
3. Temporarily provide a `image_to_spots` method which the SpotFinderAlgorithmBase requires.

Test plan: `make -j fast`
@ttung ttung requested a review from ambrosejcarr April 8, 2019 18:23
Copy link
Member

@ambrosejcarr ambrosejcarr 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 if green.

@codecov-io
Copy link

codecov-io commented Apr 8, 2019

Codecov Report

Merging #1148 into master will increase coverage by 20.77%.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #1148       +/-   ##
==========================================
+ Coverage   67.63%   88.4%   +20.77%     
==========================================
  Files         132     132               
  Lines        4903    4907        +4     
==========================================
+ Hits         3316    4338     +1022     
+ Misses       1587     569     -1018
Impacted Files Coverage Δ
...fish/spots/_detector/local_search_blob_detector.py 94.06% <66.66%> (+61.61%) ⬆️
starfish/spots/_detector/blob.py 96.15% <0%> (+1.92%) ⬆️
starfish/pipeline/pipelinecomponent.py 92.85% <0%> (+2.38%) ⬆️
...tarfish/image/_filter/zero_by_channel_magnitude.py 100% <0%> (+2.7%) ⬆️
...mage/_registration/_learn_transform/translation.py 97.05% <0%> (+2.94%) ⬆️
.../spots/_pixel_decoder/combine_adjacent_features.py 90.42% <0%> (+3.19%) ⬆️
starfish/imagestack/parser/tileset/_parser.py 84.94% <0%> (+3.22%) ⬆️
starfish/spacetx_format/validate_sptx.py 83.33% <0%> (+3.7%) ⬆️
starfish/types/_constants.py 100% <0%> (+3.92%) ⬆️
starfish/_display.py 26.66% <0%> (+4.44%) ⬆️
... and 62 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 04c78ba...317a0e4. Read the comment docs.

Notes
-----
blobs_image is an unused parameter that is included for testing purposes. It should not
be passed to this method. If it is passed, the method will trigger a ValueError.
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@ambrosejcarr TRAILING WHITESPACE!! :)

@ttung ttung merged commit bc9107c into master Apr 8, 2019
@ttung ttung deleted the tonytung-hacky-shit branch April 8, 2019 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants