8000 Merge branch 'v1.4.0-doc' into v1.4.x · matplotlib/matplotlib@e981c68 · GitHub
[go: up one dir, main page]
Skip to content

Commit e981c68

Browse files
tacaswelltacaswell
committed
Merge branch 'v1.4.0-doc' into v1.4.x
 - manually fixed version number
2 parents f2e7dd1 + 88cdac9 commit e981c68

File tree

8 files changed

+59
-59
lines changed

8 files changed

+59
-59
lines changed

‎INSTALL

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ you will also need to install compatible versions of
6666
`pyparsing <https://pypi.python.org/pypi/pyparsing/>`_ and
6767
`six <https://pypi.python.org/pypi/six>`_
6868
in addition to
69-
`matplotlib <https://pypi.python.org/pypi/matplotlib>`_.
69+
`matplotlib <http://matplotlib.org/downloads.html>`_.
7070

7171
In case Python is not installed for all users (not the default), the
7272
Microsoft Visual C++ 2008 (
@@ -106,14 +106,15 @@ standard Python shell or IPython. It is enabled as the default backend
106106
for the official binaries. GTK3 is not supported on Windows.
107107

108108
The Windows installers (:file:`*.exe`) and wheels (:file:`*.whl`) on
109-
the download page do not contain test data or example code.
109+
the `download page <http://matplotlib.org/downloads.html>`_ do not
110+
contain test data or example code.
110111
If you want to try the many demos that come in the matplotlib source
111-
distribution, download the zip file and look in the :file:`examples`
112-
subdirectory.
113-
To run the test suite, copy the lib\matplotlib\tests and
114-
lib\mpl_toolkits\tests directories from the source distribution to
115-
sys.prefix\Lib\site-packages\matplotlib and
116-
sys.prefix\Lib\site-packages\mpl_toolkits respectively, and install
112+
distribution, download the :file:`*.tar.gz` file and look in the
113+
:file:`examples` subdirectory.
114+
To run the test suite, copy the :file:`lib\matplotlib\tests` and
115+
:file:`lib\mpl_toolkits\tests` directories from the source distribution to
116+
:file:`sys.prefix\Lib\site-packages\matplotlib` and
117+
:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and install
117118
`nose <https://pypi.python.org/pypi/nose>`_,
118119
`mock <https://pypi.python.org/pypi/mock>`_,
119120
Pillow, MiKTeX, GhostScript, ffmpeg, avconv, mencoder, ImageMagick, and
@@ -239,8 +240,18 @@ Optional dependencies
239240
selection of image file formats.
240241

241242

242-
:term:`freetype` 1.4 (or later)
243-
library for reading true type font files.
243+
:term:`freetype` 2.4 or later
244+
library for reading true type font files. Matplotlib in known
245+
to work with freetype 2.3, and the required version will be reduced
246+
in 1.4.1. If you need to build from source on a system which only has
247+
freetype 2.3 available, please edit L945 of `setupext.py` to reduce
248+
`min_version` to 2.3.
249+
250+
`pytz`
251+
Required if you want to manipulate datetime objects which are time-zone
252+
aware. An exception will be raised if you try to make time-zone aware
253+
plots with out `pytz` installed. It will become a required dependency
254+
in 1.4.1.
244255

245256

246257
Required libraries that ship with matplotlib

‎doc/_templates/citing.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,11 @@ <h1>Citing matplotlib</h1>
2424
year = 2007
2525
}
2626
</pre>
27+
28+
29+
<h2>DOIs</h2>
30+
<dl>
31+
<dt>v1.4.0</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.11451"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.11451.png" alt="10.5281/zenodo.11451"></a></dd>
32+
</dl>
33+
2734
{% endblock %}

‎doc/_templates/layout.html

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -178,25 +178,6 @@ <h3>{{ _('Navigation') }}</h3>
178178

179179
{% block relbar1 %}
180180

181-
<!-- Piwik -->
182-
<script type="text/javascript">
183-
if ("matplotlib.sourceforge.net" == document.location.hostname ||
184-
"matplotlib.sf.net" == document.location.hostname) {
185-
var pkBaseURL = (("https:" == document.location.protocol) ? "https://apps.sourceforge.net/piwik/matplotlib/" : "http://apps.sourceforge.net/piwik/matplotlib/");
186-
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
187-
}
188-
</script>
189-
<script type="text/javascript">
190-
if ("matplotlib.sourceforge.net" == document.location.hostname ||
191-
"matplotlib.sf.net" == document.location.hostname) {
192-
piwik_action_name = '';
193-
piwik_idsite = 1;
194-
piwik_url = pkBaseURL + "piwik.php";
195-
piwik_log(piwik_action_name, piwik_idsite, piwik_url);
196-
document.write(unescape('%3Cobject%3E%3Cnoscript%3E%3Cp%3E%3Cimg src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/%3E%3C/p%3E%3C/noscript%3E%3C/object%3E'));
197-
}
198-
</script>
199-
<!-- End Piwik Tag -->
200181
<link rel="shortcut icon" href="/_static/favicon.ico">
201182

202183
<!-- The "Fork me on github" ribbon -->

‎doc/users/plotting/colormaps/Lfunction.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
'''
2-
Recreate Josef Albers plot illustrating the Weber-Fechner law and illustrate
3-
with the binary matplotlib colormap, too. Trying to show the difference between
2+
Recreate Josef Albers plot illustrating the Weber-Fechner law and illustrate
3+
with the binary matplotlib colormap, too. Trying to show the difference between
44
adding blackness to a color at different rates.
55
'''
66

77
import numpy as np
88
import matplotlib.pyplot as plt
9-
from skimage import io, color
10-
import pdb
9+
from skimage import color
1110
import matplotlib as mpl
12-
from mpl_toolkits.mplot3d import Axes3D
13-
from matplotlib import cm, colors
11+
from matplotlib import cm
1412

1513

1614
mpl.rcParams.update({'font.size': 20})
@@ -90,7 +88,7 @@
9088

9189

9290
# common ylabel
93-
ax1.text(-0.3, 3.8, 'Additional Parts Black',
91+
ax1.text(-0.3, 3.8, 'Additional Parts Black',
9492
rotation=90, transform=ax1.transAxes)
9593

9694

@@ -164,7 +162,7 @@
164162
ax2.spines['left'].set_visible(False)
165163

166164
# common ylabel
167-
ax1.text(-0.3, 4.0, 'Steps through map indices',
165+
ax1.text(-0.3, 4.0, 'Steps through map indices',
168166
rotation=90, transform=ax1.transAxes)
169167

170168
fig.subplots_adjust(hspace=0.0)

‎doc/users/plotting/colormaps/grayscale.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
Uses lightness L* as a proxy for grayscale value.
44
'''
55

6-
from skimage import io, color
6+
from skimage import color
77
import numpy as np
88
import matplotlib.pyplot as plt
99
from matplotlib import cm
1010
import matplotlib as mpl
11-
import pdb
12-
from scipy.optimize import curve_fit
1311

1412
mpl.rcParams.update({'font.size': 14})
1513
mpl.rcParams['font.sans-serif'] = 'Arev Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Helvetica, Avant Garde, sans-serif'
@@ -40,7 +38,7 @@
4038
10000 'gnuplot', 'gnuplot2', 'ocean', 'rainbow',
4139
'terrain', 'flag', 'prism'])]
4240

43-
# indices to step through colormap
41+
# indices to step through colormap
4442
x = np.linspace(0.0, 1.0, 100)
4543

4644
nrows = max(len(cmap_list) for cmap_category, cmap_list in cmaps)
@@ -78,4 +76,3 @@ def plot_color_gradients(cmap_category, cmap_list):
7876
for cmap_category, cmap_list in cmaps:
7977

8078
plot_color_gradients(cmap_category, cmap_list)
81-

‎doc/users/plotting/colormaps/lightness.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
For each colormap, plot the lightness parameter L* from CIELAB colorspace along the y axis vs index through the colormap. Colormaps are examined in categories as in the original matplotlib gallery of colormaps.
33
'''
44

5-
from skimage import io, color
5+
from skimage import color
66
import numpy as np
77
import matplotlib.pyplot as plt
88
from matplotlib import cm
99
import matplotlib as mpl
10-
import pdb
11-
from scipy.optimize import curve_fit
1210

1311
mpl.rcParams.update({'font.size': 14})
1412
mpl.rcParams['font.sans-serif'] = 'Arev Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Helvetica, Avant Garde, sans-serif'
@@ -39,7 +37,7 @@
3937
'gnuplot', 'gnuplot2', 'ocean', 'rainbow',
4038
'terrain', 'flag', 'prism'])]
4139

42-
# indices to step through colormap
40+
# indices to step through colormap
4341
x = np.linspace(0.0, 1.0, 100)
4442

4543
# Do plot
@@ -49,9 +47,9 @@
4947
dsub = 5 # number of colormaps per subplot
5048
if cmap_category == 'Diverging': # because has 13 colormaps
5149
dsub = 6
52-
elif cmap_category == 'Sequential2':
50+
elif cmap_category == 'Sequential2':
5351
dsub = 7
54-
elif cmap_category == 'Sequential':
52+
elif cmap_category == 'Sequential':
5553
dsub = 7
5654
nsubplots = int(np.ceil(len(cmap_list)/float(dsub)))
5755

@@ -63,7 +61,7 @@
6361

6462
ax = fig.add_subplot(nsubplots, 1, i+1)
6563
# pdb.set_trace()
66-
64+
6765
for j, cmap in enumerate(cmap_list[i*dsub:(i+1)*dsub]):
6866

6967
# Get rgb values for colormap
@@ -113,7 +111,7 @@
113111
ax.scatter(x+j*dc, lab[0,:,0], c=x, cmap=cmap, s=300, linewidths=0.)
114112
ax.axis([-0.1,6.1,0,100])
115113
locs.append(x[int(x.size/2.)]+j*dc) # store locations for colormap labels
116-
114+
117115
# Set up labels for colormaps
118116
ax.xaxis.set_ticks_position('top')
119117
ticker = mpl.ticker.FixedLocator(locs)

‎doc/users/whats_new.rst

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ activity, but this can be problematic for the red/green colorblind. A new,
3838
colorblind-friendly colormap is now available at :class:`matplotlib.cm.Wistia`.
3939
This colormap maintains the red/green symbolism while achieving deuteranopic
4040
legibility through brightness variations. See
41-
`here <https://github.com/wistia/heatmap-palette>`
41+
`here <https://github.com/wistia/heatmap-palette>`_
4242
for more information.
4343

4444
Documentation changes
@@ -70,20 +70,20 @@ containing the positions for each element of the boxplots. Then
7070
a second method, :func:`~matplotlib.Axes.bxp` is called to draw the boxplots
7171
based on the stats.
7272

73-
The :func:~matplotlib.pyplot.boxplot function can be used as before to
73+
The :func:`~matplotlib.pyplot.boxplot` function can be used as before to
7474
generate boxplots from data in one step. But now the user has the
7575
flexibility to generate the statistics independently, or to modify the
76-
output of :func:~matplotlib.cbook.boxplot_stats prior to plotting
77-
with :func:~matplotlib.Axes.bxp.
76+
output of :func:`~matplotlib.cbook.boxplot_stats` prior to plotting
77+
with :func:`~matplotlib.Axes.bxp`.
7878

7979
Lastly, each artist (e.g., the box, outliers, cap, notches) can now be
8080
toggled on or off and their styles can be passed in through individual
8181
kwargs. See the examples:
82-
:ref:`~examples/statistics/boxplot_demo.py` and
83-
:ref:`~examples/statistics/bxp_demo.py`
82+
:ref:`statistics-boxplot_demo` and
83+
:ref:`statistics-bxp_demo`
8484

85-
Added a bool kwarg, `manage_xticks`, which if False disables the management
86-
of the xtick and xlim by `boxplot`.
85+
Added a bool kwarg, :code:`manage_xticks`, which if False disables the management
86+
of the ticks and limits on the x-axis by :func:`~matplotlib.axes.Axes.bxp`.
8787

8888
Support for datetime axes in 2d plots
8989
`````````````````````````````````````
@@ -317,6 +317,14 @@ Backwards compatibility for Qt4 is maintained by wrapping the Qt5 implementation
317317

318318
The Qt5Agg backend currently does not work with IPython's %matplotlib magic.
319319

320+
The 1.4.0 release has a known bug where the toolbar is broken. This can be
321+
fixed by: ::
322+
323+
cd path/to/installed/matplotlib
324+
wget https://github.com/matplotlib/matplotlib/pull/3322.diff
325+
# unix2dos 3322.diff (if on windows to fix line endings)
326+
patch -p2 < 3322.diff
327+
320328
Qt4 backend
321329
```````````
322330
Rudolf Höfler changed the appearance of the subplottool. All sliders are

‎lib/matplotlib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
import sys
107107
import distutils.version
108108

109-
__version__ = '1.4.0'
109+
__version__ = '1.4.x'
110110
__version__numpy__ = '1.6' # minimum required numpy version
111111

112112
try:

0 commit comments

Comments
 (0)
0