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

Forget legacy data dir #4662

Merged
merged 3 commits into from
May 8, 2020
Merged

Forget legacy data dir #4662

merged 3 commits into from
May 8, 2020

Conversation

jni
Copy link
Member

@jni jni commented May 8, 2020

Description

Fixes #4659

... I think. =P

Checklist

For reviewers

  • Check that the PR title is short, concise, and will make sense 1 year
    later.
  • Check that new functions are imported in corresponding __init__.py.
  • Check that new features, API changes, and deprecations are mentioned in
    doc/release/release_dev.rst.

Copy link
Member

@emmanuelle emmanuelle 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, thanks!

@emmanuelle emmanuelle merged commit 137f144 into scikit-image:master May 8, 2020
@tlambert03
Copy link
Contributor

thanks!

emmanuelle pushed a commit that referenced this pull request May 8, 2020
* Forget legacy data dir

* Add tests for data dir

* Ignore pooch tests when github.com is not reachable
@hmaarrfk
Copy link
Member

hmaarrfk commented May 9, 2020

Nice touch up

@jni jni deleted the pooch-data-dir branch May 9, 2020 04:28
@hmaarrfk
Copy link
Member

hmaarrfk commented May 9, 2020

I think the problem is that some logic around making pooch optional got lost.

I opened an issue for it.

@hmaarrfk
Copy link
Member

hmaarrfk commented May 9, 2020

@meeseeksdev backport to v0.17.x

@lumberbot-app
Copy link

lumberbot-app bot commented May 9, 2020

Can't Dooooo.... It seem like this is already backported (commit is empty).I won't do anything. MrMeeseeks out.

hmaarrfk added a commit to hmaarrfk/scikit-image that referenced this pull request May 9, 2020
hmaarrfk added a commit to hmaarrfk/scikit-image that referenced this pull request May 9, 2020
import numpy as np
import skimage.data as data
from skimage import io
from skimage._shared.testing import assert_equal, assert_almost_equal, fetch
from skimage._shared.testing import (
assert_equal, assert_almost_equal, fetch, skipif
Copy link
Member

Choose a reason for hiding this comment

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

using fetch from here will automatically skip things if it is offline.

Copy link
Member

Choose a reason for hiding this comment

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

or i guess, if pooch isn't installed. We can add an offline check too.

emmanuelle added a commit that referenced this pull request May 11, 2020
* Revert "Forget legacy data dir (#4662)"

This reverts commit 137f144.

* Make pooch an optional requirement

* Make pooch an optional dependency

* Add Pooch to documentation requirements

* Fixup add documentation to the docstring

* Add cell.png to the legacy registry

* Update datadir order

* Try to avoid circular stuff

* Split up the init pooch function

* Refine error message when pooch not found

* Remove unused imports

* Add the os directory test again

* Add a test for download all

* Add an error for installing Pooch.

* Crosslink to our installation instructions

* Update skimage/data/__init__.py

Co-authored-by: Emmanuelle Gouillart <emma@plot.ly>

Co-authored-by: Juan Nunez-Iglesias <juan.nunez-iglesias@monash.edu>
Co-authored-by: Emmanuelle Gouillart <emma@plot.ly>
emmanuelle added a commit that referenced this pull request May 12, 2020
* Revert "Forget legacy data dir (#4662)"

This reverts commit 137f144.

* Make pooch an optional requirement

* Make pooch an optional dependency

* Add Pooch to documentation requirements

* Fixup add documentation to the docstring

* Add cell.png to the legacy registry

* Update datadir order

* Try to avoid circular stuff

* Split up the init pooch function

* Refine error message when pooch not found

* Remove unused imports

* Add the os directory test again

* Add a test for download all

* Add an error for installing Pooch.

* Crosslink to our installation instructions

* Update skimage/data/__init__.py

Co-authored-by: Emmanuelle Gouillart <emma@plot.ly>

Co-authored-by: Juan Nunez-Iglesias <juan.nunez-iglesias@monash.edu>
Co-authored-by: Emmanuelle Gouillart <emma@plot.ly>
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.

data_dir always falling back to legacy_data_dir
4 participants