Skip to content

Backport of #3238#3310

Merged
soupault merged 5 commits intoscikit-image:v0.14.xfrom
jni:numpy-indexing-2
Aug 14, 2018
Merged

Backport of #3238#3310
soupault merged 5 commits intoscikit-image:v0.14.xfrom
jni:numpy-indexing-2

Conversation

@jni
Copy link
Copy Markdown
Member

@jni jni commented Aug 2, 2018

Description

See #3238 for details.

@soupault it was only four commits so I just cherry-picked them individually. I agree that merge commits are messy. =)

@pep8speaks
Copy link
Copy Markdown

pep8speaks commented Aug 2, 2018

Hello @jni! Thanks for updating the PR.

Line 35:80: E501 line too long (131 > 79 characters)

Comment last updated on August 02, 2018 at 10:51 Hours UTC

Copy link
Copy Markdown
Member

@soupault soupault left a comment

Choose a reason for hiding this comment

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

@soupault soupault added 🔧 type: Maintenance Refactoring and maintenance of internals status: mrg+1 labels Aug 2, 2018
@soupault soupault added this to the 0.14.1 milestone Aug 2, 2018
@jni
Copy link
Copy Markdown
Member Author

jni commented Aug 2, 2018

@soupault oops! Fixed!

@hmaarrfk
Copy link
Copy Markdown
Member

@jni I think this PR should be backported first. then rebase #3304 and the tests should pass.

@jni
Copy link
Copy Markdown
Member Author

jni commented Aug 14, 2018

Thanks @hmaarrfk, clearly these PRs are acceptable. ;) @soupault I suggest we do single-reviewer merge for manual backports, since they have already gone through approval on master. Too many contributors are on vacation right now LOL and our release is being held back by several of these backports.

@hmaarrfk
Copy link
Copy Markdown
Member

Does github allow you to set rules for what you can merge? Seems like @stefanv has BDFL powers. Did he not extend those to you @jni?

@soupault soupault merged commit c4c2f0c into scikit-image:v0.14.x Aug 14, 2018
@jni jni deleted the numpy-indexing-2 branch August 15, 2018 00:48
@jni
Copy link
Copy Markdown
Member Author

jni commented Aug 15, 2018

@hmaarrfk

Does github allow you to set rules for what you can merge? Seems like @stefanv has BDFL powers. Did he not extend those to you @jni?

We all have the same powers, but we endeavour to use them responsibly. =) By an unwritten agreement that needs to become written (I alluded to this in my roadmap proposal), we only merge after two reviews. But the backporting/LTS thing is new and we don't have a policy for these.

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

Labels

🔧 type: Maintenance Refactoring and maintenance of internals

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants