Code

Merge 1.5.x to 2.x#6443

Code

Merged

tacaswell merged 13 commits intomatplotlib:v2.xmatplotlib/matplotlib:v2.xfrom

jenshnielsen:merge15xto2xjenshnielsen/matplotlib:merge15xto2xCopy head branch name to clipboard

May 21, 2016

Commits

Commits on May 17, 2016

• Defer to 2D scatter() for handling of 'c'. Closes #5974.

  WeatherGod

  committed
  8e2b7a9

  Copy full SHA for 8e2b7a9

• Merge pull request #6439 from WeatherGod/scatter3d_color

  Show description for fc654e6
  mdboom

  committed
  fc654e6

  Copy full SHA for fc654e6

• MNT: Raise an error for invalid args in animation.save.

  Show description for 7d1f717
  dopplershift

  committed
  7d1f717

  Copy full SHA for 7d1f717

• MNT: Improve error message when saving animation fails.

  dopplershift

  committed
  ecfc1e7

  Copy full SHA for ecfc1e7

• MNT: Add original exception to raised IOError.

  dopplershift

  committed
  5e5999f

  Copy full SHA for 5e5999f

• MNT: Re-arrange docs to avoid repeating save verbiage.

  dopplershift

  committed
  7c98a98

  Copy full SHA for 7c98a98

• Merge pull request #6441 from dopplershift/anim-errors

  Show description for e2549cd
  WeatherGod

  committed
  e2549cd

  Copy full SHA for e2549cd

Commits on May 19, 2016

• Revert 2c1bc6b for performance

  mdboom

  committed
  27d1199

  Copy full SHA for 27d1199

• Use ( , ) instead of [] for indexing

  Show description for 2c5d292
  mdboom

  committed
  2c5d292

  Copy full SHA for 2c5d292

• Rename operator[] to subarray...

  Show description for 7976970
  mdboom

  committed
  7976970

  Copy full SHA for 7976970

• Don't use contouring on the path unless necessary

  mdboom

  committed
  aef86ad

  Copy full SHA for aef86ad

• Merge pull request #6450 from mdboom/slow-path

  Show description for 5bad764
  tacaswell

  committed
  5bad764

  Copy full SHA for 5bad764

Commits on May 21, 2016

• Merge remote-tracking branch 'matplotlib/v1.5.x' into merge15xto2x

  jenshnielsen

  committed
  712500d

  Copy full SHA for 712500d