8000 Use v{} for version tags with pooch by jni · Pull Request #5104 · scikit-image/scikit-image · GitHub
[go: up one dir, main page]

Skip to content

Use v{} for version tags with pooch #5104

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

Merged
merged 2 commits into from
Dec 7, 2020
Merged

Use v{} for version tags with pooch #5104

merged 2 commits into from
Dec 7, 2020

Conversation

jni
Copy link
Member
@jni jni commented Dec 5, 2020

Description

The pooch URL was incorrect for released version tags given our convention to use v0.18.0 rather than just 0.18.0 for releases.

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.

@jni
Copy link
Member Author
jni commented Dec 5, 2020

Reference thread on Zulip: https://skimage.zulipchat.com/#narrow/stream/175598-general/topic/release.200.2E18/near/218161832

But, looks like this works for versions but not master... Hold please...

@jni jni added this to the 0.18 milestone Dec 5, 2020
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.

Thanks @jni. pre failures have been addressed in #5103.

@emmanuelle
Copy link
Member

We'll need a second person to review/approve/merge here.

@@ -125,7 +125,12 @@ def create_image_fetcher():
# This helps pooch understand that it should look in master
# to find the required files
pooch_version = __version__.replace('.dev', '+')
url = "https://github.com/scikit-image/scikit-image/raw/{version}/skimage/"
if '+' in pooch_version:
Copy link
Member
@hmaarrfk hmaarrfk Dec 5, 2020

Choose a reason for hiding this comment

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

why is the logic different?

Copy link
Member Author

Choose a reason for hiding this comment

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

@hmaarrfk for master, the data lives in github.com/scikit-image/scikit-image/raw/master/skimage/..., while for version tags, it's in github.com/scikit-image/scikit-image/raw/v0.18.0/skimage/..., for example.

Technically, the approach is not quite correct: the v0.18.x branch will still look in master. This happens to work, but might not always. For now, it gets us unstuck. In the future, maybe we move to setuptools_scm, which would solve a lot of issues more elegantly.

Copy link
Member

Choose a reason for hiding this comment

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

This, and pooch knows how to convert internally version to master so that in the url it's master, I guess?

@emmanuelle
Copy link
Member

@scikit-image/core please review/merge, this is a fix needed for the release.

@emmanuelle
Copy link
Member

Thank you all, merging.

@mkcor
Copy link
Member
mkcor commented Dec 7, 2020

@emmanuelle I understand that the CI failure is resolved by #5109, right?

@emmanuelle
Copy link
Member

@mkcor by #5103 (which itself is fixed by #5109)

@jni jni merged commit 2e60e97 into scikit-image:master Dec 7, 2020
@jni jni deleted the data-urls branch December 7, 2020 08:22
@jni
Copy link
Member Author
jni commented Dec 7, 2020

@meeseeksdev backport to v0.18.x

meeseeksmachine pushed a commit to meeseeksmachine/scikit-image that referenced this pull request Dec 7, 2020
mkcor pushed a commit that referenced this pull request Dec 7, 2020
Co-authored-by: Juan Nunez-Iglesias <juan.nunez-iglesias@monash.edu>
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.

4 participants
0