Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1521b44

Browse files
WeatherGodWeatherGod
committed
Merge branch 'v1.2.x' of github.com:matplotlib/matplotlib into mplot3d/autoscale_fix
2 parents a215b53 + f79562c commit 1521b44

File tree

109 files changed

+9576
-5168
lines changed

Some content is hidden

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

109 files changed

+9576
-5168
lines changed

‎.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ python:
77
- 3.2
88

99
install:
10-
- pip install --use-mirrors nose numpy
10+
- pip install --use-mirrors nose
11+
# This is a workaround to install numpy with the version of
12+
# virtualenv in Travis. If that is updated in the future, this can
13+
# be simplified to 'pip install numpy'
14+
- 'if [ $TRAVIS_PYTHON_VERSION == "3.2" ] || [ $TRAVIS_PYTHON_VERSION == "3.1" ]; then pip install https://github.com/y-p/numpy/archive/1.6.2_with_travis_fix.tar.gz; fi'
15+
- 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install numpy; fi' # should be nop if pre-installed
1116
- if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install --use-mirrors PIL; fi
1217
- python setup.py install
1318

‎CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Please refer to the [Coding
2+
Guidelines](http://matplotlib.org/devel/coding_guide.html).

‎LICENSE/LICENSE

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LICENSE AGREEMENT FOR MATPLOTLIB 1.1.0
1+
LICENSE AGREEMENT FOR MATPLOTLIB 1.2.0
22
--------------------------------------
33

44
1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
99
2. Subject to the terms and conditions of this License Agreement, JDH
1010
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
1111
to reproduce, analyze, test, perform and/or display publicly, prepare
12-
derivative works, distribute, and otherwise use matplotlib 1.1.0
12+
derivative works, distribute, and otherwise use matplotlib 1.2.0
1313
alone or in any derivative version, provided, however, that JDH's
1414
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
1515
2002-2011 John D. Hunter; All Rights Reserved" are retained in
16-
matplotlib 1.1.0 alone or in any derivative version prepared by
16+
matplotlib 1.2.0 alone or in any derivative version prepared by
1717
Licensee.
1818

1919
3. In the event Licensee prepares a derivative work that is based on or
20-
incorporates matplotlib 1.1.0 or any part thereof, and wants to
20+
incorporates matplotlib 1.2.0 or any part thereof, and wants to
2121
make the derivative work available to others as provided herein, then
2222
Licensee hereby agrees to include in any such work a brief summary of
23-
the changes made to matplotlib 1.1.0.
23+
the changes made to matplotlib 1.2.0.
2424

25-
4. JDH is making matplotlib 1.1.0 available to Licensee on an "AS
25+
4. JDH is making matplotlib 1.2.0 available to Licensee on an "AS
2626
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
2727
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
2828
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
29-
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.1.0
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.2.0
3030
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
3131

3232
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
33-
1.1.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
33+
1.2.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
3434
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35-
MATPLOTLIB 1.1.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
35+
MATPLOTLIB 1.2.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
3636
THE POSSIBILITY THEREOF.
3737

3838
6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee. This License Agreement does not grant permission to use JDH
4444
trademarks or trade name in a trademark sense to endorse or promote
4545
products or services of Licensee, or any third party.
4646

47-
8. By copying, installing or otherwise using matplotlib 1.1.0,
47+
8. By copying, installing or otherwise using matplotlib 1.2.0,
4848
Licensee agrees to be bound by the terms and conditions of this License
4949
Agreement.

‎MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include CHANGELOG KNOWN_BUGS INSTALL
2-
include INTERACTIVE TODO
2+
include INTERACTIVE TODO CONTRIBUTING.md
33
include Makefile make.osx MANIFEST.in MANIFEST
44
include matplotlibrc.template setup.cfg.template
55
include __init__.py setupext.py setup.py setupegg.py

‎README.osx

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
11
Building mpl on OSX has proven to be a nightmare because of all the
22
different types of zlib, png and freetype that may be on your system.
3-
The recommended and supported way to build is to use the make.osx file
4-
in this directory. This script requires you to set a PREFIX
5-
environment variable where you want the install to go. It will
6-
fetch the dependencies from a remote server and install them into your
7-
PREFIX dir, and then build mpl against them. It should ignore any
8-
lib, png or freetype on your system
3+
The recommended and supported way to build is to use a third-party
4+
package manager to install the required dependencies, and then
5+
install matplotlib from source using the setup.py script. Two widely
6+
used package managers are homebrew and MacPorts. The following
7+
example illustrates how to install libpng and freetype using
8+
homebrew.
99

1010
Example usage::
1111

12-
make -f make.osx PREFIX=/Users/jdhunter/dev PYVERSION=2.6 \
13-
fetch deps mpl_install_std
14-
15-
Variables:
16-
PREFIX (required): where to install the dependencies
17-
PYVERSION (optional): which python version to use
18-
(default=python, e.g. PYVERSION=2.6 uses python2.6)
19-
20-
Targets:
21-
22-
clean: remove compiled files
23-
fetch: download dependencies
24-
deps: build all dependencies (zlib, png, freetype)
25-
mpl_build: compile matplotlib
26-
mpl_install: install matplotlib in $PREFIX/lib/pythonX.Y/site-packages
27-
mpl_install_std: install matplotlib in standard site-packages directory
28-
mpl_install_egg: install matplotlib as an egg
29-
mpl_install_develop: set up egg link to working directory (for developers)
30-
binaries: create the dmg file for distribution
12+
brew install libpng freetype
13+
14+
If you are using MacPorts, execute the following instead:
15+
16+
Example usage::
17+
18+
port install libpng freetype
19+
20+
To install matplotlib from source, execute:
21+
22+
Example usage::
23+
24+
python setup.py install

‎test/TODO renamed to ‎TODO_TESTS

File renamed without changes.

‎doc/_templates/citing.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{% extends "layout.html" %}
2+
{% set title = "Citing matplotlib" %}
3+
{% block body %}
4+
5+
<h1>Citing matplotlib</h1>
6+
<p>
7+
If matplotlib contributes to a project that leads to a scientific publication,
8+
please acknowledge this fact by citing the project. You can use this
9+
BibTeX entry:
10+
</p>
11+
<pre>
12+
@Article{Hunter:2007,
13+
Author = {Hunter, J. D.},
14+
Title = {Matplotlib: A 2D graphics environment},
15+
Journal = {Computing In Science \& Engineering},
16+
Volume = {9},
17+
Number = {3},
18+
Pages = {90--95},
19+
abstract = {Matplotlib is a 2D graphics package used for Python
20+
for application development, interactive scripting, and
21+
publication-quality image generation across user
22+
interfaces and operating systems.},
23+
publisher = {IEEE COMPUTER SOC},
24+
year = 2007
25+
}
26+
</pre>
27+
{% endblock %}

‎doc/_templates/index.html

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
}
3636
</script>
3737

38-
<!-- The "Fork me on github" ribbon -->
39-
<a href="https://github.com/matplotlib/matplotlib"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" alt="Fork me on GitHub"></a>
4038

4139
<h1>John Hunter (1968-2012)</h1>
4240

@@ -140,7 +138,7 @@ <h4>Need help?</h4>
140138

141139
<p>Check the <a href="{{ pathto('faq/index') }}">faq</a>,
142140
the <a href="{{ pathto('api/index') }}">api</a> docs,
143-
<a href="http://sourceforge.net/mailarchive/forum.php?forum_name=matplotlib-users">mailing
141+
<a href="http://matplotlib.1069221.n5.nabble.com/matplotlib-users-f3.html">mailing
144142
list archives</a>, and join the matplotlib
145143
mailing <a href="http://sourceforge.net/mail/?group_id=80706">lists</a>.
146144
Check out the matplotlib questions
@@ -154,10 +152,14 @@ <h4>Need help?</h4>
154152
<a href="https://github.com/matplotlib/matplotlib/issues?sort=created&direction=desc&state=open">tracker</a>,
155153
but it is a good idea to ping us on the mailing list too.</p>
156154

157-
<p>For details on what's new, see the detailed <a href="{{
158-
pathto('_static/CHANGELOG', 1) }}">changelog</a> or browse the <a href="https://github.com/matplotlib/matplotlib">source code</a>. Anything that could
159-
require changes to your existing codes is logged in the <a href="{{
160-
pathto('api/api_changes.html', 1) }}">api changes</a> file.</p>
155+
<p>To keep up to date with what's going on in matplotlib, see
156+
the <a href="{{ pathto('users/whats_new.html', 1) }}">what's new
157+
page</a>, the more detailed <a href="{{ pathto('_static/CHANGELOG', 1)
158+
}}">changelog</a> or browse
159+
the <a href="https://github.com/matplotlib/matplotlib">source
160+
code</a>. Anything that could require changes to your existing code
161+
is logged in the <a href="{{ pathto('api/api_changes.html', 1) }}">api
162+
changes</a> file.</p>
161163

162164
<h1>Toolkits</h1>
163165

@@ -169,6 +171,18 @@ <h1>Toolkits</h1>
169171
pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
170172
</p>
171173

174+
<h1>Citing matplotlib</h1>
175+
176+
<p>
177+
matplotlib is the brainchild of John Hunter (1968-2012), who has put an
178+
inordinate amount of effort into producing a piece of software utilized by
179+
thousands of scientists worldwide.
180+
181+
If matplotlib contributes to a project that leads to a scientific publication,
182+
please acknowledge this fact by citing the project. You can use this
183+
<a href="{{ pathto('citing') }}">ready-made citation entry</a>.
184+
</p>
185+
172186
<h1>Open source</h1>
173187

174188
<p>Please

‎doc/_templates/layout.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<li><a href="{{ pathto('search') }}">search</a>|&nbsp;</li>
77
<li><a href="{{ pathto('examples/index') }}">examples</a>|&nbsp;</li>
88
<li><a href="{{ pathto('gallery') }}">gallery</a>|&nbsp;</li>
9+
<li><a href="{{ pathto('citing') }}">citation</a>|&nbsp;</li>
910
<li><a href="{{ pathto('contents') }}">docs</a> &raquo;</li>
1011
{% endblock %}
1112

@@ -32,10 +33,17 @@
3233
<!-- End Piwik Tag -->
3334
<link rel="shortcut icon" href="_static/favicon.ico">
3435

36+
<!-- The "Fork me on github" ribbon -->
37+
<img style="float: right; margin-bottom: -40px; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png" usemap="#ribbonmap"/>
38+
<map name="ribbonmap">
39+
<area shape="poly" coords="15,0,148,-1,148,135" href="https://github.com/matplotlib/matplotlib" title="Fork me on GitHub" />
40+
</map>
41+
3542
<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
3643
<a href="{{ pathto('index') }}"><img src="{{
3744
pathto("_static/logo2.png", 1) }}" border="0" alt="matplotlib"/></a>
3845
</div>
46+
3947
{{ super() }}
4048
{% endblock %}
4149

‎doc/api/api_changes.rst

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@ For new features that were added to matplotlib, please see
1414
Changes in 1.2.x
1515
================
1616

17+
* The ``classic`` option of the rc parameter ``toolbar`` is deprecated
18+
and will be removed in the next release.
19+
20+
* The :meth:`~matplotlib.cbook.isvector` method has been removed since it
21+
is no longer functional.
22+
23+
* The `rasterization_zorder` property on `~matplotlib.axes.Axes` a
24+
zorder below which artists are rasterized. This has defaulted to
25+
-30000.0, but it now defaults to `None`, meaning no artists will be
26+
rasterized. In order to rasterize artists below a given zorder
27+
value, `set_rasterization_zorder` must be explicitly called.
28+
1729
* In :meth:`~matplotlib.axes.Axes.scatter`, and `~pyplot.scatter`,
1830
when specifying a marker using a tuple, the angle is now specified
1931
in degrees, not radians.
@@ -90,14 +102,14 @@ Changes in 1.2.x
90102
def transform(self, xy):
91103
...
92104
transform_non_affine = transform
93-
94-
105+
106+
95107
This approach will no longer function correctly and should be changed to::
96108

97109
class MyTransform(mtrans.Transform):
98110
def transform_non_affine(self, xy):
99111
...
100-
112+
101113

102114
* Artists no longer have ``x_isdata`` or ``y_isdata`` attributes; instead
103115
any artist's transform can be interrogated with
@@ -114,9 +126,9 @@ Changes in 1.2.x
114126
>>> print(ax.viewLim)
115127
Bbox('array([[ 0., 0.],\n [ 90., 90.]])')
116128

117-
* One can now easily get a transform which goes from one transform's coordinate system
118-
to another, in an optimized way, using the new subtract method on a transform. For instance,
119-
to go from data coordinates to axes coordinates::
129+
* One can now easily get a transform which goes from one transform's coordinate
130+
system to another, in an optimized way, using the new subtract method on a
131+
transform. For instance, to go from data coordinates to axes coordinates::
120132

121133
>>> import matplotlib.pyplot as plt
122134
>>> ax = plt.axes()
@@ -126,9 +138,9 @@ Changes in 1.2.x
126138
>>> print(data2ax.depth)
127139
2
128140

129-
for versions before 1.2 this could only be achieved in a sub-optimal way, using
130-
``ax.transData + ax.transAxes.inverted()`` (depth is a new concept, but had it existed
131-
it would return 4 for this example).
141+
for versions before 1.2 this could only be achieved in a sub-optimal way,
142+
using ``ax.transData + ax.transAxes.inverted()`` (depth is a new concept,
143+
but had it existed it would return 4 for this example).
132144

133145
* ``twinx`` and ``twiny`` now returns an instance of SubplotBase if
134146
parent axes is an instance of SubplotBase.
@@ -142,6 +154,9 @@ Changes in 1.2.x
142154
:class:`~matplotlib.colors.Colormap` and
143155
:class:`~matplotlib.colors.Normalize` now subclasses ``object``
144156

157+
* ContourSet instances no longer have a ``transform`` attribute. Instead,
158+
access the transform with the ``get_transform`` method.
159+
145160
Changes in 1.1.x
146161
================
147162

‎doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133

134134
# Additional templates that should be rendered to pages, maps page names to
135135
# template names.
136-
html_additional_pages = {'index': 'index.html', 'gallery':'gallery.html'}
136+
html_additional_pages = {'index': 'index.html', 'gallery':'gallery.html', 'citing':'citing.html'}
137137

138138
# If false, no module index is generated.
139139
#html_use_modindex = True

0 commit comments

Comments
 (0)