Merge v2.x into master #6246

Merged

jenshnielsen merged 28 commits into matplotlib:master from jenshnielsen:mergev2.xmaster

Mar 30, 2016

Owner

jenshnielsen commented Mar 30, 2016

Doing via a PR to make sure I get the conflicts handled correctly

tacaswell and others added some commits Dec 31, 2015

tacaswell	`ENH: add XKCD colorname -> hex mapping`		`605a8af`
tacaswell	`MNT: normalize X11/CSS/HTML colors` - removed darksage, lightsage, sage which are colors we added in `1ac590e` These colors are now included in the XKCD mapping - correct sandybrown which mpl had as '#FAA460' but should be '#F4A460' according to the w3 group, wikipedia, the copy of rgb.txt bundled in the emacs source, and the mapping that we had bundled with AGG for a while. The original value goes back to `ec45d17`		`010be02`
tacaswell	`MNT: normalize to use un-spaced names in XKCD map`		`e392d03`
tacaswell	`MNT: unify string handling` - convert the single-letter colors to hex in source - single path for looking up string -> hex -> rgb values		`e049a49`
tacaswell	`MNT: always validate alpha as [0, 1] or None`		`bda202b`
tacaswell	`MNT: add xkcd prefix + switch priority order` - prefer the CSS4 str -> hex values because they are the 'standard'. The xkcd colors might be 'better', but we are not the right place to lead that change. If users use CSS/HTML/X11 color in mpl they should expect it to match the same color set in html for embedding mpl figures into websites and such. - Provide entries in XKCD dict of all names (with and with out spaces) prefixed with XKCD. Thus to get XKCD's version of blue use `color='xkcdblue'		`b2543f6`
tacaswell	`FIX: restore single character colors to rgb tuples` The hex representations are not exact which resulted in very small slight color changes.		`9feeb9e`
tacaswell	`DOC: remove last paypal link`		`3d4a517`
tacaswell	`WIP color docs`		`b93bd5d`
mdboom	`Update LICENSE file to match doc/users/license.rst`		`db5ef16`
tacaswell	`DOC: remove static images`		`80a8e53`
tacaswell	`DOC/MNT: remove unused/outdate files`		`f3d4415`
tacaswell	`FIX: use lowercase in map` ColorConverter lowercases everything on the way in.		`9963cca`
tacaswell	`DOC: string -> color mappings`		`fafa36f`
tacaswell	`Merge pull request #6124 from estan/qt5-example-fixes` Fix about dialog on Qt 5		`20db6a0`
mdboom	`Fixed year issues`		`7c4eb6b`
tacaswell	`Merge pull request #6098 from mdboom/license-update` Update LICENSE file to match doc/users/license.rst		`1bd80a2`
tacaswell	`Merge pull request #6194 from story645/patch-1` Documentation bug fix: #5517		`d74eca5`
tacaswell	`Merge pull request #6195 from story645/patch-2` Documentation bug #6180		`e277f99`
tacaswell	`Merge pull request #6205 from mdboom/fix-stringio` Use io.BytesIO instead of io.StringIO in examples		`40cfef1`
tacaswell	`TST: add smoke test for the color blue`		`9687f65`
jenshnielsen	`Merge pull request #5775 from tacaswell/enh_xkcd_colors` ENH: add XKCD colorname -> hex mapping		`9655f45`
efiring	`Merge pull request #6178 from mdboom/macagg` Use Agg for rendering in the Mac OSX backend		`e981e1e`
tacaswell	`Merge pull request #6238 from jenshnielsen/fixsphinx140issues` Fix sphinx 1.4.0 issues Conflicts: .travis.yml Reject all changes		`3a944a6`
jenshnielsen	`Merge pull request #5973 from tacaswell/doc_update_donation` Doc update donation	Some checks were not successful 1 errored and 1 successful checks continuous-integration/travis-ci/pr — The Travis CI build could not complete due to an error Details continuous-integration/travis-ci/push — The Travis CI build passed Details	`bf82d92`
jenshnielsen	`Merge pull request #6244 from matplotlib/v1.5.1-doc` merge V1.5.1 doc into 1.5.x	Some checks were not successful 1 errored and 1 successful checks continuous-integration/travis-ci/pr — The Travis CI build could not complete due to an error Details continuous-integration/travis-ci/push — The Travis CI build passed Details	`860fdfe`
jenshnielsen	`Merge pull request #6245 from matplotlib/v1.5.x` merge V1.5.x into 2.x		`9e1668b`
jenshnielsen	`Merge remote-tracking branch 'matplotlib/v2.x' into mergev2.xmaster`	All checks have passed 2 successful checks continuous-integration/appveyor/pr — AppVeyor build succeeded Details continuous-integration/travis-ci/pr — The Travis CI build passed Details	`6461814`