Skip to content

Commit f7f18c4

Browse files
egpbosegpbos
committed
Merge remote-tracking branch 'upstream/master' into stackplot_6313
2 parents 506df7b + c227b14 commit f7f18c4

File tree

136 files changed

+707
-411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+707
-411
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ John Hunter <jdh2358@gmail.com>
2828
Jorrit Wronski <jowr@mek.dtu.dk>
2929
Jouni K. Seppänen <jks@iki.fi>
3030
Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Mad Physicist <madphysicist@users.noreply.github.com>
31+
Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Joseph Fox-Rabinovitz <joseph.r.fox-rabinovitz@nasa.gov>
3132
Julien Schueller <julien.schueller@gmail.com> <schueller@porsche-l64.phimeca.lan>
3233
Julien Schueller <julien.schueller@gmail.com> <schueller@bx-l64.phimeca.lan>
3334
Kevin Davies <kdavies4@gmail.com> <daviesk24@yahoo.com>

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ script:
139139
deactivate
140140
source ~/virtualenv/python2.7/bin/activate
141141
pip install pip --upgrade
142-
pip install linkchecker
142+
# linkchecker is currently broken with requests 2.10.0 so force an earlier version
143+
pip install $PRE requests==2.9.2 linkchecker
143144
linkchecker build/html/index.html
144145
fi
145146
- rm -rf $HOME/.cache/matplotlib/tex.cache

‎INSTALL

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ Required Dependencies
212212
Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz
213213

214214
:term:`FreeType` 2.3 or later
215-
Library for reading true type font files. If using pip, easy_install or
215+
Library for reading true type font files. If using pip, easy_install or
216216
installing from source, the installer will attempt to locate FreeType in
217-
expected locations. If it cannot, try installing `pkg-config
217+
expected locations. If it cannot, try installing `pkg-config
218218
<http://matplotlib.org/users/installing.html#optional-dependencies>`__,
219219
a tool used to find required non-python libraries.
220220

221-
`cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
221+
`cycler <http://matplotlib.org/cycler/>`__ 0.10.0 or later
222222
Composable cycle class used for constructing style-cycles
223223

224224
`functools32`

‎doc/thirdpartypackages/index.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,7 @@ mplstereonet
165165
===============
166166

167167
`mplstereonet <https://github.com/joferkington/mplstereonet>`_ provides stereonets for plotting and analyzing orientation data in Matplotlib.
168+
169+
pyupset
170+
===============
171+
`pyUpSet <https://github.com/ImSoErgodic/py-upset>`_ is a static Python implementation of the `UpSet suite by Lex et al. <http://www.caleydo.org/tools/upset/>`_ to explore complex intersections of sets and data frames.

‎doc/users/whats_new/rcparams.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Configuration (rcParams)
1616
+----------------------------+--------------------------------------------------+
1717
|`date.autoformatter.second` | format string for 'second' scale times |
1818
+----------------------------+--------------------------------------------------+
19+
|`scatter.marker` | default marker for scatter plot |
20+
+----------------------------+--------------------------------------------------+
1921
|`svg.hashsalt` | see note |
2022
+----------------------------+--------------------------------------------------+
2123

‎doc/users/whats_new/uptade_subplot2grid.rst renamed to ‎doc/users/whats_new/update_subplot2grid.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
New Firgure Parameter for subplot2grid
1+
New Figure Parameter for subplot2grid
22
--------------------------------------
33

44
A ``fig`` parameter now exists for the method :func:`subplot2grid`. This allows
5-
for the figure that the subplots will be created in to be specified. If ``fig``
5+
a user to specify the figure where the subplots will be created. If ``fig``
66
is ``None`` (default) then the method will use the current figure retrieved by
77
:func:`gcf`.
88

‎examples/animation/dynamic_image.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
"""
32
An animated image
43
"""

‎examples/animation/dynamic_image2.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
"""
32
An animated image
43
"""

‎examples/api/agg_oo.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
# -*- noplot -*-
32
"""
43
A pure OO (look Ma, no pylab!) example using the agg backend

‎examples/api/barchart_demo.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
#!/usr/bin/env python
31
# a bar plot with errorbars
42
import numpy as np
53
import matplotlib.pyplot as plt

0 commit comments

Comments
 (0)