Skip to content

V2.x merge to master #5845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jan 13, 2016
Merged

V2.x merge to master #5845

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
71d8b2b
DOC: add new DOI link
tacaswell Jan 10, 2016
f00c01c
Correct mep numbers in headers
jenshnielsen Jan 11, 2016
4229fc2
Merge pull request #5833 from jenshnielsen/meptypos
tacaswell Jan 11, 2016
72cf5b8
Fix #5829. Update the baseline image.
mdboom Jan 11, 2016
54291ff
Merge pull request #5834 from mdboom/fix-interpolation-10dpi
jenshnielsen Jan 12, 2016
f9f5452
BLD: include tests.py in sdist
tacaswell Jan 12, 2016
fbcdd1b
Merge pull request #5813 from zblz/dec-comma
mdboom Jan 13, 2016
30e6bb7
Merge pull request #5840 from tacaswell/bld_inc_testspy
mdboom Jan 13, 2016
c28e1b0
Fix new pep8 issue in legend_demo5
jenshnielsen Jan 13, 2016
52b711f
Merge pull request #5844 from jenshnielsen/pep8leg5
WeatherGod Jan 13, 2016
501888a
Merge remote-tracking branch 'matplotlib/v1.5.1-doc' into v1.5.x
jenshnielsen Jan 13, 2016
9d2a95f
Merge branch 'v1.5.x' into v2.x
jenshnielsen Jan 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ recursive-include lib *
recursive-include extern *
include versioneer.py
include lib/matplotlib/_version.py
include tests.py
1 change: 1 addition & 0 deletions doc/_templates/citing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ <h1>Citing matplotlib</h1>

<h2>DOIs</h2>
<dl>
<dt>v1.5.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.44579"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.44579.svg" alt="10.5281/zenodo.44579"></a></dd>
<dt>v1.5.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.32914"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.32914.svg" alt="10.5281/zenodo.32914"></a></dd>
<dt>v1.4.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.15423"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.15423.svg" alt="10.5281/zenodo.15423"></a></dd>
<dt>v1.4.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.12400"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.12400.png" alt="10.5281/zenodo.12400"></a></dd>
Expand Down
2 changes: 1 addition & 1 deletion doc/devel/MEP/MEP13.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
=================================
MEP12: Use properties for Artists
MEP13: Use properties for Artists
=================================

.. contents::
Expand Down
2 changes: 1 addition & 1 deletion doc/devel/MEP/MEP14.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
====================
MEP13: Text handling
MEP14: Text handling
====================

.. contents::
Expand Down
2 changes: 1 addition & 1 deletion examples/pylab_examples/legend_demo5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def create_artists(self, legend, orig_handle,
lw = orig_handle.get_linewidths()[i]
except IndexError:
lw = orig_handle.get_linewidths()[0]
if dashes[0] != None:
if dashes[0] is not None:
legline.set_dashes(dashes[1])
legline.set_color(color)
legline.set_transform(trans)
Expand Down
22 changes: 11 additions & 11 deletions lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.