Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 9c1b548

Browse filesBrowse files
committed
Merge branch 'v1.5.3-doc' into v2.x
2 parents 92b5c95 + b083cf6 commit 9c1b548
Copy full SHA for 9c1b548

File tree

Expand file treeCollapse file tree

3 files changed

+32
-5
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+32
-5
lines changed

‎doc/_templates/index.html

Copy file name to clipboardExpand all lines: doc/_templates/index.html
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ <h1>Toolkits</h1>
172172
3d plotting with <a href="{{ pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>,
173173
axes and axis helpers in <a href="{{ pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a>,
174174
several higher-level plotting interfaces
175-
<a href="http://web.stanford.edu/~mwaskom/software/seaborn">seaborn</a>,
175+
<a href="https://seaborn.github.io/">seaborn</a>,
176176
<a href="http://holoviews.org">holoviews</a>,
177177
<a href="http://ggplot.yhathq.com">ggplot</a>, and more.
178178
</p>

‎doc/api/api_changes.rst

Copy file name to clipboardExpand all lines: doc/api/api_changes.rst
+28Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,34 @@ where "ax" is an ``Axes3d`` object created with something like ::
155155
ax = plt.sublot(111, projection='3d')
156156

157157

158+
Changes in 1.5.3
159+
================
160+
161+
``ax.plot(..., marker=None)`` gives default marker
162+
--------------------------------------------------
163+
164+
Prior to 1.5.3 kwargs passed to `~matplotlib.Axes.plot` were handled
165+
in two parts -- default kwargs generated internal to
166+
`~matplotlib.Axes.plot` (such as the cycled styles) and user supplied
167+
kwargs. The internally generated kwargs were passed to the
168+
`matplotlib.lines.Line2D.__init__` and the user kwargs were passed to
169+
``ln.set(**kwargs)`` to update the artist after it was created. Now
170+
both sets of kwargs are merged and passed to
171+
`~matplotlib.lines.Line2D.__init__`. This change was made to allow `None`
172+
to be passed in via the user kwargs to mean 'do the default thing' as
173+
is the convention through out mpl rather than raising an exception.
174+
175+
Unlike most `~matplotlib.lines.Line2D` setter methods
176+
`~matplotlib.lines.Line2D.set_marker` did accept `None` as a valid
177+
input which was mapped to 'no marker'. Thus, by routing this
178+
``marker=None`` through ``__init__`` rather than ``set(...)`` the meaning
179+
of ``ax.plot(..., marker=None)`` changed from 'no markers' to 'default markers
180+
from rcparams'.
181+
182+
This is change is only evident if ``mpl.rcParams['lines.marker']`` has a value
183+
other than ``'None'`` (which is string ``'None'`` which means 'no marker').
184+
185+
158186
Changes in 1.5.2
159187
================
160188

‎doc/mpl_toolkits/index.rst

Copy file name to clipboardExpand all lines: doc/mpl_toolkits/index.rst
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,9 @@ seaborn
176176
=======
177177
(*Not distributed with matplotlib*)
178178

179-
`seaborn <http://web.stanford.edu/~mwaskom/software/seaborn>`_ is a high
180-
level interface for drawing statistical graphics with matplotlib. It
181-
aims to make visualization a central part of exploring and
182-
understanding complex datasets.
179+
`seaborn <https://seaborn.github.io/>`_ is a high level interface for drawing
180+
statistical graphics with matplotlib. It aims to make visualization a central
181+
part of exploring and understanding complex datasets.
183182

184183
.. image:: /_static/seaborn.png
185184
:height: 157px

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.