Skip to content

Backport #3242: handle NumPy 1.15 warnings in dependencies#3304

Merged
soupault merged 6 commits intoscikit-image:v0.14.xfrom
jni:backport-3242
Aug 15, 2018
Merged

Backport #3242: handle NumPy 1.15 warnings in dependencies#3304
soupault merged 6 commits intoscikit-image:v0.14.xfrom
jni:backport-3242

Conversation

@jni
Copy link
Copy Markdown
Member

@jni jni commented Aug 1, 2018

See #3242 for details.

@pep8speaks
Copy link
Copy Markdown

pep8speaks commented Aug 1, 2018 •
edited
Loading

Hello @jni! Thanks for updating the PR.

Cheers ! There are no PEP8 issues in this Pull Request. 🍻

Comment last updated on August 15, 2018 at 03:04 Hours UTC

@jni jni requested a review from soupault August 1, 2018 00:44
@soupault soupault added 🔧 type: Maintenance Refactoring and maintenance of internals status: mrg+1 labels Aug 1, 2018
@soupault soupault added this to the 0.14.1 milestone Aug 1, 2018
@hmaarrfk
Copy link
Copy Markdown
Member

hmaarrfk commented Aug 1, 2018

@jni, I think #3238 needs to be included in this one to see the full effects. They were broken up to have more focused discussion, but now that the discussion has been had, I think it is OK to just keep them as one.

@jni
Copy link
Copy Markdown
Member Author

jni commented Aug 2, 2018

Ah! I remember seeing @soupault's lamentation about manual backporting but then neglected to do anything about it! LOL I'll try to tack those commits onto this PR.

@hmaarrfk hmaarrfk mentioned this pull request Aug 14, 2018
Merged
@soupault
Copy link
Copy Markdown
Member

soupault commented Aug 14, 2018

#3238 has been merged. Looking forward to seeing this rebased :)

hmaarrfk
hmaarrfk requested changes Aug 14, 2018
View reviewed changes
TODO.txt Outdated
once minimal required ``numpy`` is set to >= 1.14.0.
* Remove deprecated ``Hxx, Hxy, Hyy`` API of ``hessian_matrix_eigvals`` in
``skimage.feature.corner``.
* Monitor when ``matplotlib`` releases a version greater than 2.2.2 and test
Copy link
Copy Markdown
Member

@hmaarrfk hmaarrfk Aug 14, 2018

Choose a reason for hiding this comment

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

This should be removed.

tools/travis/install_qt.sh
export QT_API=pyside
# Now configure Matplotlib to use Qt5
elif [[ "${QT}" == "PyQt5" ]]; then
pip install --retries 3 -q $PIP_FLAGS pyqt5
Copy link
Copy Markdown
Member

@hmaarrfk hmaarrfk Aug 14, 2018

Choose a reason for hiding this comment

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

now this should be kept.

@jni
Copy link
Copy Markdown
Member Author

jni commented Aug 15, 2018

Rebased, and added @hmaarrfk's fixes. Thanks to both!

@hmaarrfk
Copy link
Copy Markdown
Member

hmaarrfk commented Aug 15, 2018

Alright a little more green. Are we still supporting 3.4?

@jni
Copy link
Copy Markdown
Member Author

jni commented Aug 15, 2018

Very good question. I would not remove it unless strictly necessary. But it's also true that if you're on 3 at all, you're very likely to be on 3.5+ these days.

@hmaarrfk
Copy link
Copy Markdown
Member

hmaarrfk commented Aug 15, 2018

I thin kthe issues stem from tuple unpacking.

@jni jni mentioned this pull request Aug 15, 2018
Merged
4 tasks
@codecov-io
Copy link
Copy Markdown

codecov-io commented Aug 15, 2018 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (v0.14.x@c4c2f0c). Click here to learn what that means.
The diff coverage is 94%.

Impacted file tree graph

@@            Coverage Diff             @@
##             v0.14.x    #3304   +/-   ##
==========================================
  Coverage           ?   85.93%           
==========================================
  Files              ?      336           
  Lines              ?    27379           
  Branches           ?        0           
==========================================
  Hits               ?    23527           
  Misses             ?     3852           
  Partials           ?        0
Impacted Files Coverage Δ
skimage/novice/_novice.py 86.29% <ø> (ø)
skimage/color/tests/test_colorconv.py 98.29% <0%> (ø)
skimage/io/tests/test_imageio.py 68.75% <100%> (ø)
skimage/util/tests/test_dtype.py 100% <100%> (ø)
skimage/restoration/_cycle_spin.py 92.3% <100%> (ø)
skimage/measure/tests/test_simple_metrics.py 100% <100%> (ø)
skimage/morphology/greyreconstruct.py 96.42% <100%> (ø)
skimage/_shared/_warnings.py 91.3% <75%> (ø)
skimage/filters/tests/test_lpi_filter.py 87.5% <95.83%> (ø)
skimage/segmentation/tests/test_random_walker.py 98.43% <95.83%> (ø)
... and 1 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 c4c2f0c...d2f2845. Read the comment docs.

@hmaarrfk hmaarrfk mentioned this pull request Aug 15, 2018
Closed
@hmaarrfk
Copy link
Copy Markdown
Member

hmaarrfk commented Aug 15, 2018

So. much. green.

@jni
Copy link
Copy Markdown
Member Author

jni commented Aug 15, 2018

😍 💚 💚 💚 💚 😍

I'll let you do the honours, @soupault!

@soupault soupault merged commit c8443d8 into scikit-image:v0.14.x Aug 15, 2018
@soupault
Copy link
Copy Markdown
Member

soupault commented Aug 15, 2018

@jni sorry for stealing all the fun, @jni. 😎 Thanks a lot for the PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hmaarrfk hmaarrfk hmaarrfk approved these changes

@soupault soupault soupault approved these changes

Assignees

No one assigned

Labels

🔧 type: Maintenance Refactoring and maintenance of internals

Projects

None yet

Milestone

0.14.1

Development

Successfully merging this pull request may close these issues.

5 participants

@jni @pep8speaks @hmaarrfk @soupault @codecov-io