/matplotlib

Correct regex in filterwarnings #5735

Merged
merged 2 commits into from Dec 23, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.1 (next point r...
2 participants
@jenshnielsen @tacaswell
@jenshnielsen
Owner

jenshnielsen commented Dec 23, 2015

The method name has changed, also enable an assert which should have been enabled earlier
@jenshnielsen jenshnielsen Correct regex in filterwarnings 
The method name has changed, also enable an assert which should have been enabled earlier

Some checks were not successful

1 errored and 2 successful checks
continuous-integration/appveyor/pr — AppVeyor build cancelled
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage remained the same at 68.329%
Details
d9c9c55

tacaswell added the needs_review label Dec 23, 2015

@jenshnielsen
Owner

jenshnielsen commented Dec 23, 2015

Actually I would probably prefer changing the error message. The message is inside subplots() not add_subplots so not sure whats going on
@jenshnielsen jenshnielsen Change error message to reflect the name of the method

Some checks were not successful

1 errored, 1 failing, and 1 successful checks
continuous-integration/appveyor/pr — AppVeyor build cancelled
Details
continuous-integration/travis-ci/pr — The Travis CI build failed
Details
coverage/coveralls — Coverage remained the same at 68.329%
Details
6979fe5
@jenshnielsen
Owner

jenshnielsen commented Dec 23, 2015

Implemented the other solution in the second commit

tacaswell added this to the Critical bugfix release (1.5.1) milestone Dec 23, 2015

@tacaswell tacaswell added a commit that referenced this pull request Dec 23, 2015

@tacaswell tacaswell Merge pull request #5735 from jenshnielsen/fixfilterwarnings 
FIX: Correct regex in filterwarnings
 6df722f

@tacaswell tacaswell merged commit 6df722f into matplotlib:master Dec 23, 2015
1 of 3 checks passed

1 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
coverage/coveralls Coverage remained the same at 68.329%
Details

tacaswell removed the needs_review label Dec 23, 2015

@tacaswell tacaswell modified the milestone: proposed next point release (2.1), Critical bugfix release (1.5.1) Dec 23, 2015

@tacaswell
Owner

tacaswell commented Dec 23, 2015

This does not cherry-pick cleanly back to 1.5.x because where subplots is implemented moved to figure from pyplot in #5146 (which is where the name miss-match comes from, in the initial version of the PR the function was called add_subplots not subplots).

The assert should be uncommented on 1.5.x in a it's own PR.

jenshnielsen deleted the jenshnielsen:fixfilterwarnings branch Dec 23, 2015

@jenshnielsen
Owner

jenshnielsen commented Dec 23, 2015

Ok I will do a PR to fix the assert on 1.5.x
@tacaswell
Owner

tacaswell commented Dec 23, 2015

thanks.

@jenshnielsen jenshnielsen added a commit to jenshnielsen/matplotlib that referenced this pull request Dec 23, 2015

@jenshnielsen jenshnielsen enable assert on 1.5 branch 
Backport of relevant part of #5735
 878598c

jenshnielsen referenced this pull request Dec 23, 2015

Merged

enable assert on 1.5 branch #5736

@jenshnielsen
Owner

jenshnielsen commented Dec 23, 2015

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