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

Skip to content

Commit eb2f2ba

Browse files
Merge remote branch 'upstream/master'
2 parents 75595da + 2147ca8 commit eb2f2ba

File tree

106 files changed

+3107
-1914
lines changed

Some content is hidden

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

106 files changed

+3107
-1914
lines changed

.mailmap

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,32 @@ Ben Root <[email protected]> Benjamin Root <[email protected]>
55
Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
66
Kevin Davies <[email protected]> Kevin Davies <[email protected]>
77
Christoph Gohlke <[email protected]> cgohlke <[email protected]>
8+
Christoph Gohlke <[email protected]> C. Gohlke <[email protected]>
9+
10+
Daniel Hyams <[email protected]> Daniel Hyams <dhyams@gitdev.(none)>
11+
Daniel Hyams <[email protected]> dhyams <[email protected]>
12+
Francesco Montesano <[email protected]> montefra <[email protected]>
13+
James R. Evans <[email protected]> James Evans <[email protected]>
14+
Jeffrey Bingham <[email protected]> Jeff Bingham <[email protected]>
15+
Jens Hedegaard Nielsen <[email protected]> Jens H Nielsen <[email protected]>
16+
Jens Hedegaard Nielsen <[email protected]> Jens H. Nielsen <[email protected]>
17+
Jens Hedegaard Nielsen <[email protected]> Jens H. Nielsen <[email protected]>
18+
Jens Hedegaard Nielsen <[email protected]> Jens Hedegaard Nielsen <[email protected]>
19+
Julien Schueller <[email protected]> jschueller <[email protected]>
20+
Julien Schueller <[email protected]> Julien Schueller <[email protected]>
21+
Julien Schueller <[email protected]> Julien Schueller <[email protected]>
22+
Matthias Bussonnier <[email protected]> Matthias BUSSONNIER <[email protected]>
23+
Matthias Bussonnier <[email protected]> Bussonnier Matthias <[email protected]>
24+
25+
Nelle Varoquaux <[email protected]> Varoquaux <[email protected]>
26+
Nicolas P. Rougier <[email protected]> Nicolas Rougier <[email protected]>
27+
28+
Per Parker <[email protected]> solvents <[email protected]>
29+
Peter Würtz <[email protected]> pwuertz <[email protected]>
30+
Peter Würtz <[email protected]> pwuertz <[email protected]>
31+
Peter Würtz <[email protected]> Peter Würtz <[email protected]>
32+
Phil Elson <[email protected]> Phil Elson <[email protected]>
33+
Phil Elson <[email protected]> Phil Elson <[email protected]>
34+
35+
36+
Scott Lasley <[email protected]> selasley <[email protected]>

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ script:
3434
# Generate the font caches in a single process before starting the
3535
# multiple processes
3636
- python -c "from matplotlib import font_manager"
37+
- if [[ $BUILD_DOCS == false ]]; then export MPL_REPO_DIR=$PWD; fi # pep8-conformance test of the examples
3738
- if [[ $BUILD_DOCS == false ]]; then mkdir ../tmp_test_dir; fi
3839
- if [[ $BUILD_DOCS == false ]]; then cd ../tmp_test_dir; fi
3940
- if [[ $BUILD_DOCS == false ]]; then python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS; fi

INSTALL

Lines changed: 41 additions & 22 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
@@ -163,9 +164,11 @@ Build requirements
163164

164165
These are external packages which you will need to install before
165166
installing matplotlib. If you are building on OSX, see
166-
:ref:`build_osx`. If you are installing dependencies with a package
167-
manager on Linux, you may need to install the development packages
168-
(look for a "-dev" postfix) in addition to the libraries themselves.
167+
:ref:`build_osx`. If you are building on Windows, see
168+
:ref:`build_windows`. If you are installing dependencies with a
169+
package manager on Linux, you may need to install the development
170+
packages (look for a "-dev" postfix) in addition to the libraries
171+
themselves.
169172

170173

171174
Required Dependencies
@@ -197,9 +200,7 @@ six 1.3 or later
197200
libpng 1.2 (or later)
198201
library for loading and saving :term:`PNG` files (`download
199202
<http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
200-
zlib. If you are a Windows user, you can ignore this because we
201-
build support into the matplotlib single-click installer
202-
203+
zlib.
203204

204205
Optional GUI framework
205206
^^^^^^^^^^^^^^^^^^^^^^
@@ -235,13 +236,23 @@ ImageMagick
235236
Optional dependencies
236237
^^^^^^^^^^^^^^^^^^^^^
237238

238-
`Pillow http://python-imaging.github.io/`__
239+
`Pillow <http://python-imaging.github.io/>`_
239240
If Pillow is installed, matplotlib can read and write a larger
240241
selection of image file formats.
241242

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.
242255

243-
:term:`freetype` 1.4 (or later)
244-
library for reading true type font files.
245256

246257

247258
Required libraries that ship with matplotlib
@@ -295,12 +306,20 @@ the different OSX version (e.g., 10.4 and 10.5). We recommend that you build
295306
the way we do for the OSX release: get the source from the tarball or the
296307
git repository and follow the instruction in :file:`README.osx`.
297308

298-
.. _build_osx:
309+
310+
.. _build_windows:
311+
299312

300313
Building on Windows
301314
-------------------
302315

303-
Building for source on windows can be difficult. Please see
304-
`matplotlib-windbuild
305-
<https://github.com/jbmohler/matplotlib-winbuild>`_ for detailed
306-
instructions, dependency source blobs, and helper scripts.
316+
The Python shipped from http://www.python.org is compiled with Visual Studio
317+
2008 for versions before 3.3 and Visual Studio 2010 for 3.3 and later. Python
318+
extensions are recommended to be compiled with the same compiler. The .NET
319+
Framework 4.0 is required for MSBuild (you'll likely have the requisite
320+
Framework with Visual Studio). In addition to Visual Studio `CMake
321+
<http://www.cmake.org>`_ is required for building libpng.
322+
323+
Since there is no canonical Windows package manager the build methods for
324+
freetype, zlib, libpng, tcl, & tk source code are documented as a build script
325+
at `matplotlib-winbuild <https://github.com/jbmohler/matplotlib-winbuild>`.

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/faq/installing_faq.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ line script to the appropriate places.
145145
.. note::
146146
Mac OSX users please see the :ref:`build_osx` guide.
147147

148+
Windows users please see the :ref:`build_windows` guide.
149+
148150
Then, if you want to update your matplotlib at any time, just do::
149151

150152
> git pull

0 commit comments

Comments
 (0)