/matplotlib

Merge from v2.x #6431

Merged
merged 31 commits into from May 16, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  2.1 (next point r...
6 participants
@efiring @dopplershift @QuLogic @tacaswell @jenshnielsen @mdboom
@efiring
Owner

efiring commented May 16, 2016

This merge from v2.x into master also required a little editing, and it involves many changes, hence this PR. I resolved conflicts in .travis.yml and lib/matplotlib/tests/test_colors.py.

tacaswell and others added some commits Feb 25, 2016

@tacaswell tacaswell PRF: change draw -> draw_idle 
closes #6058
2cd3401
@tacaswell tacaswell MNT: cleanup initialization of subplot 
The 'left' and 'right' sliders are both created at 0 and then updated
to the values read out of the figure.  There is logic in the callback
functions to separate singular inputs and a second set of callback
functions to ensure that the min/max stay in the right order.  What was
happening is:

 - both left and right are 0
 - set left to the value from the figure
 - constraint callback fires and sets the minimum of right to be equal
   to the current value of left.  Qt helpfully adjust the value of the
   slider from 0 -> the left value (as 0 is now no longer an allowed
   value)
 - the callback to adjust the figure fires, notes that the left and
   right values are the same and makes the input value a bit smaller
 - propagates that value back to the figure.

The solution is to set the values of each slider before connecting up
the callback.

closes #6121
3a2d8d2
@tacaswell tacaswell FIX: prevent an infinite loop 
closes #6057
be40bd5
@jenshnielsen jenshnielsen Block pyparsing 2.1.2 which is broken on python3.4
82ae8ef
@jenshnielsen jenshnielsen Missed one in the travis file
bc447a9
@tacaswell tacaswell Merge pull request #6401 from jenshnielsen/excludepyparsing 
Block pyparsing 2.1.2 which is broken on python3.4
306b546
@tacaswell tacaswell FIX: apply tick.side rcparam to major&minor ticks 
Extends
cbb3dc8
to also apply to minor ticks

closes #6408
c21bf6d
@efiring efiring Merge pull request #6410 from tacaswell/fix_minor_ticks_respect_tick_… 
…rcparams

FIX: apply tick.side rcparam to major&minor ticks
dccb4e2
@tacaswell tacaswell Merge pull request #6397 from fariza/stop-gtk-key-event-propagation 
MNT: key events handler return value to True to stop propagation it gtk
9b39f3e
@tacaswell tacaswell Merge pull request #6390 from anntzer/xkcd-colors-namespace 
API: Use xkcd: prefix to avoid color name clashes.
c2b6769
@tacaswell tacaswell Merge pull request #6415 from fariza/remove-gtk-linepropsdialog 
CLN: removing unused DialogLineprops from gtk3
25bdedd
@tacaswell tacaswell Merge pull request #6146 from maqifrnswa/master 
API: ticker.LinearLocator view_limits algorithm changes

closes #6142
e785afb
@mdboom mdboom Merge pull request #6061 from tacaswell/prf_qt_config_draw 
PRF: change draw -> draw_idle
1156e23
@dopplershift dopplershift Merge pull request #6060 from tacaswell/fix_infinite_ticker_loop 
Fix infinite ticker loop
1081385
@efiring efiring BUG: copy image data so it can't be modified prior to drawing 
Closes #6419
88db38b
@tacaswell tacaswell Merge pull request #6422 from efiring/image_copy_data 
BUG: copy image data so it can't be modified prior to drawing
d92f161
@tacaswell tacaswell ENH: add musecond scale to AutoDateFormatter 
The lack of this scale is pointed out in #6365 and was the big
difference between pandas AutoDateFormatter and the stock upstream
version.
27b1a36
@efiring efiring BUG: fix contour zmin, zmax types to work with LinearLocator 
Closes #6270
Also removes an unused argument from the _autolev method.
848e77e
@tacaswell tacaswell Merge pull request #6425 from efiring/contour_linear_locator 
BUG: fix contour zmin, zmax types to work with LinearLocator
f7445bb
@jenshnielsen jenshnielsen Merge pull request #6409 from tacaswell/enh_more_autodate_split_points 
ENH: add musecond scale to AutoDateFormatter
1dd3b09
@dopplershift dopplershift MNT: Refactor animation handling of 'bbox_inches'. 
Instead of a hard-coded look for either instance types or strings, make
it a property of the MovieWriter instances. Set the flag to true by
default for the MovieFileWriters (which all seem to work fine) and make
it false by default for MovieWriters (which are currently pipe-based and
break). We can also eliminate looking at strings by doing the check
after we create the instance of MovieWriter (if necessary).
 949ecdd
@dopplershift dopplershift FIX: Animations should disable savefig.bbox as necessary. 
This fixes part of #6416 by resetting the 'savefig.bbox' rcParam if it
is set to 'tight'.
 885b6fd
@dopplershift dopplershift MNT: Move comment next to code it applies to: d28e853
@dopplershift dopplershift MNT: Fix some misspellings.
229ddf6
@tacaswell tacaswell Merge pull request #6421 from dopplershift/anim-cleanups 
FIX: animation confusion
40b01b6
@efiring efiring Merge branch 'v1.5.x' into merge_from_1.5
f5f416c
@efiring efiring Merge branch 'v1.5.x' into merge_from_1.5
909b77b
@efiring efiring Merge pull request #6430 from efiring/merge_from_1.5 
Merge from 1.5
846b95f
@efiring efiring Merge branch 'v2.x' into merge_from_v2.x
8bf3071

efiring added the needs_review label May 16, 2016

@efiring
Owner

efiring commented May 16, 2016

@tacaswell or @jenshnielsen Only appveyor is running on this--no Travis. I imagine this means I broke .travis.yml, but I don't see what the problem is.

QuLogic added this to the 2.1 (next point release) milestone May 16, 2016

@QuLogic QuLogic and 1 other commented on an outdated diff May 16, 2016

View full outdated diff
.travis.yml
@@ -76,17 +76,14 @@ install:
pip install --upgrade pip
pip install --upgrade wheel
pip install --upgrade setuptools
- - |
- # Install dependencies
- if [ -z "$PRE" ]; then
- # Install only from travis wheelhouse
- wheelhouse_pip_install $NUMPY $PANDAS;
+ # Install only from travis wheelhouse
+ - if [ -z "$PRE" ]; then
@QuLogic

QuLogic May 16, 2016

Member

The pipe on the first line is necessary here to get proper multi-line semantics.

@efiring

efiring May 16, 2016

Owner

Thank you--I completely missed that. I will put it in now.

@QuLogic QuLogic commented on an outdated diff May 16, 2016

View full outdated diff
.travis.yml
@@ -77,16 +77,14 @@ install:
pip install --upgrade wheel
pip install --upgrade setuptools
- |
- # Install dependencies
+ # Install only from travis wheelhouse
@QuLogic

QuLogic May 16, 2016

Member

This line will need to be indented to match.

efiring added some commits May 16, 2016

@efiring efiring fix travis

Some checks were not successful

2 failing and 1 pending checks
continuous-integration/appveyor/pr — AppVeyor build failed
Details
continuous-integration/travis-ci/pr — The Travis CI build failed
Details
coverage/coveralls — Coverage pending from Coveralls.io
Details
ca856d2
@efiring efiring Add missing class attribute to NullMovieWriter in test_animation.py

Some checks were not successful

1 failing and 2 successful checks
continuous-integration/appveyor/pr — AppVeyor build failed
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage increased (+0.03%) to 69.757%
Details
6a9e968
@efiring
Owner

efiring commented May 16, 2016

@dopplershift, I had to add frame_size_can_vary to NullMovieWriter in test_animation.py. I suspect it could be added to the AbstractMovieWriter instead, but I don't understand all this ABC business, so I'm not sure. I presume there is some reason you didn't add it there.

@tacaswell tacaswell merged commit 927631e into matplotlib:master May 16, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.03%) to 69.757%
Details

tacaswell removed the needs_review label May 16, 2016

@dopplershift
Contributor

dopplershift commented May 16, 2016

@efiring I think AbstractMovieWriter was added post 1.5, so no, I didn't leave it off on purpose--there was no option. 😄 Probably would be better on master to move the property to the abstract base class...

efiring deleted the efiring:merge_from_v2.x branch Jun 23, 2016

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