Skip to content

Revert "Merge pull request #6376 from charris/backport-gh-6361"#6578

Merged
charris merged 1 commit intonumpy:maintenance/1.10.xfrom
charris:rollback-6371
Oct 30, 2015
Merged

Revert "Merge pull request #6376 from charris/backport-gh-6361"#6578
charris merged 1 commit intonumpy:maintenance/1.10.xfrom
charris:rollback-6371

Conversation

@charris
Copy link
Member

@charris charris commented Oct 29, 2015

This reverts commit a600a5c, reversing
changes made to 77fb742.

The expanded warning led to incompatibilities with with Numpy 1.9, which
had already the future behavior for the cases covered by the extended
warning conditions. Rather than roll back the behavior of 1.9 only to
reimplement it later, it is thought better to preserve it and move on.

See #6575.

This reverts commit a600a5c, reversing
changes made to 77fb742.

The expanded warning led to incompatibilities with with Numpy 1.9, which
had already the future behavior for the cases covered by the extended
warning conditions. Rather than roll back the behavior of 1.9 only to
reimplement it later, it is thought better to preserve it and move on.
@charris charris added this to the 1.10.2 release milestone Oct 29, 2015
@njsmith
Copy link
Member

njsmith commented Oct 29, 2015

LGTM

Should we also add a test to here and master, checking that 1.9 behavior reported in #6575 remains?

@charris
Copy link
Member Author

charris commented Oct 29, 2015

I don't think so, it feels like a bug at this point and 1.10 should only be minor fixes after 1.10.2. Hopefully 1.11 branches end of Feb and goes full future. I think there is already enough new material in master for 1.11 if we are on an accelerated release schedule, but branching in Dec might be a bit early ;)

@njsmith
Copy link
Member

njsmith commented Oct 29, 2015

Sorry, I meant should we add a test for the "future" behavior, to make sure it remains as it is in 1.9 and will be in 1.10.2 after this is merged.

I have been quietly pondering whether to suggest going full-speed-ahead and branching 1.11 in November, but I figured I'd wait until 1.10 settled down before deciding :-)

charris added a commit that referenced this pull request Oct 30, 2015
Revert "Merge pull request #6376 from charris/backport-gh-6361"
@charris charris merged commit e60d970 into numpy:maintenance/1.10.x Oct 30, 2015
@charris charris deleted the rollback-6371 branch October 30, 2015 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants