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

Skip to content

Commit 43d9754

Browse files
mattipmattip
authored
Merge branch 'master' into tkagg-cffi
2 parents b40923d + ad27247 commit 43d9754

File tree

313 files changed

+13836
-20709
lines changed

Some content is hidden

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

313 files changed

+13836
-20709
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ test_script:
101101

102102
# this are optional dependencies so that we don't skip so many tests...
103103
- if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex pillow
104-
# missing packages on conda-forge for avconv mencoder imagemagick
104+
# missing packages on conda-forge for avconv imagemagick
105105
# This install sometimes failed randomly :-(
106106
#- choco install imagemagick
107107

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
1-
<!--Thank you so much for your PR! To help us review, fill out the form
2-
to the best of your ability. Please make use of the development guide at
3-
https://matplotlib.org/devdocs/devel/index.html
4-
5-
For help with git and github workflow, please see https://matplotlib.org/devel/gitwash/development_workflow.html
6-
7-
Please do not create the PR out of master, but out of a separate branch. -->
8-
9-
<!--Provide a general summary of your changes in the title above, for
10-
example "Raises ValueError on Non-Numeric Input to set_xlim". Please avoid
11-
non-descriptive titles such as "Addresses issue #8576".-->
12-
13-
<!--If you are contributing fixes to docstrings, please pay attention to
14-
http://matplotlib.org/devel/documenting_mpl.html#formatting. In particular,
15-
note the difference between using single backquotes, double backquotes, and
16-
asterisks in the markup.-->
17-
181
## PR Summary
192

20-
<!--Please provide at least 1-2 sentences describing the pull request in
21-
detail. Why is this change required? What problem does it solve?-->
22-
23-
<!--If it fixes an open issue, please link to the issue here.-->
24-
253
## PR Checklist
264

275
- [ ] Has Pytest style unit tests
@@ -31,8 +9,33 @@ detail. Why is this change required? What problem does it solve?-->
319
- [ ] Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
3210
- [ ] Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way
3311

34-
<!--We understand that PRs can sometimes be overwhelming, especially as the
35-
reviews start coming in. Please let us know if the reviews are unclear or the
36-
recommended next step seems overly demanding , or if you would like help in
37-
addressing a reviewer's comments. And please ping us if you've been waiting
38-
too long to hear back on your PR.-->
12+
<!--
13+
Thank you so much for your PR! To help us review your contribution, please
14+
consider the following points:
15+
16+
- A development guide is available at https://matplotlib.org/devdocs/devel/index.html.
17+
18+
- Help with git and github is available at
19+
https://matplotlib.org/devel/gitwash/development_workflow.html.
20+
21+
- Do not create the PR out of master, but out of a separate branch.
22+
23+
- The PR title should summarize the changes, for example "Raise ValueError on
24+
non-numeric input to set_xlim". Avoid non-descriptive titles such as
25+
"Addresses issue #8576".
26+
27+
- The summary should provide at least 1-2 sentences describing the pull request
28+
in detail (Why is this change required? What problem does it solve?) and
29+
link to any relevant issues.
30+
31+
- If you are contributing fixes to docstrings, please pay attention to
32+
http://matplotlib.org/devel/documenting_mpl.html#formatting. In particular,
33+
note the difference between using single backquotes, double backquotes, and
34+
asterisks in the markup.
35+
36+
We understand that PRs can sometimes be overwhelming, especially as the
37+
reviews start coming in. Please let us know if the reviews are unclear or
38+
the recommended next step seems overly demanding, if you would like help in
39+
addressing a reviewer's comments, or if you have been waiting too long to hear
40+
back on your PR.
41+
-->

‎.travis.yml

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,24 @@ addons:
1919
- result_images.tar.bz2
2020
apt:
2121
packages:
22+
- cm-super
23+
- dvipng
24+
- gdb
25+
- gir1.2-gtk-3.0
26+
- graphviz
2227
- inkscape
2328
- libav-tools
24-
- gdb
25-
- mencoder
26-
- dvipng
27-
- pgf
29+
- libcairo2
30+
- libgeos-dev
31+
- libgirepository-1.0.1
2832
- lmodern
29-
- cm-super
33+
- otf-freefont
34+
- pgf
35+
- texlive-fonts-recommended
3036
- texlive-latex-base
3137
- texlive-latex-extra
32-
- texlive-fonts-recommended
3338
- texlive-latex-recommended
3439
- texlive-xetex
35-
- graphviz
36-
- libgeos-dev
37-
- otf-freefont
3840

3941
env:
4042
global:
@@ -43,25 +45,43 @@ env:
4345
- secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
4446
- secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
4547
- secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
48+
- CYCLER=cycler
49+
- DATEUTIL=python-dateutil
50+
- MOCK=
51+
- NOSE=
4652
- NUMPY=numpy
47-
- OPENBLAS_NUM_THREADS=1
4853
- PANDAS=
54+
- PYPARSING=pyparsing
55+
- PYTEST=pytest!=3.3.0
56+
- PYTEST_COV=pytest-cov
57+
- PYTEST_PEP8=
58+
- SPHINX=sphinx
59+
- OPENBLAS_NUM_THREADS=1
4960
- NPROC=2
50-
- INSTALL_PEP8=
5161
- RUN_PEP8=
52-
- NOSE=
5362
- PYTEST_ARGS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
5463
- PYTHON_ARGS=
5564
- DELETE_FONT_CACHE=
5665

5766
matrix:
5867
include:
5968
- python: 2.7
60-
env: MOCK=mock NUMPY=numpy==1.7.1 PANDAS=pandas NOSE=nose
69+
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
70+
env:
71+
- CYCLER=cycler==0.10
72+
- DATEUTIL=python-dateutil==2.1
73+
- MOCK=mock
74+
- NOSE=nose
75+
- NUMPY=numpy==1.7.1
76+
- PANDAS='pandas<0.21.0'
77+
- PYPARSING=pyparsing==2.0.1
78+
- PYTEST=pytest==3.1.0
79+
- PYTEST_COV=pytest-cov==2.3.1
80+
- SPHINX=sphinx==1.3
6181
- python: 3.4
6282
env: PYTHON_ARGS=-OO
6383
- python: 3.6
64-
env: DELETE_FONT_CACHE=1 INSTALL_PEP8=pytest-pep8 RUN_PEP8=--pep8 PANDAS=pandas
84+
env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
6585
- python: "nightly"
6686
env: PRE=--pre
6787
- os: osx
@@ -108,21 +128,30 @@ install:
108128
# Upgrade pip and setuptools and wheel to get as clean an install as possible
109129
pip install --upgrade pip setuptools wheel
110130
- |
111-
# Install dependencies from pypi
131+
# Install dependencies from PyPI
112132
pip install --upgrade $PRE \
133+
codecov \
134+
coverage \
135+
$CYCLER \
113136
$MOCK \
114137
$NOSE \
115138
$NUMPY \
116139
$PANDAS \
117140
codecov \
118141
coverage \
119142
pillow \
120-
sphinx
143+
$PYPARSING \
144+
$DATEUTIL \
145+
$SPHINX
121146
# GUI toolkits are pip-installable only for some versions of Python so
122147
# don't fail if we can't install them. Make it easier to check whether the
123148
# install was successful by trying to import the toolkit (sometimes, the
124149
# install appears to be successful but shared libraries cannot be loaded at
125150
# runtime, so an actual import is a better check).
151+
pip install cairocffi pgi &&
152+
python -c 'import pgi as gi; gi.require_version("Gtk", "3.0"); from pgi.repository import Gtk' &&
153+
echo 'pgi is available' ||
154+
echo 'pgi is not available'
126155
pip install pyqt5 &&
127156
python -c 'import PyQt5.QtCore' &&
128157
echo 'PyQt5 is available' ||
@@ -134,15 +163,14 @@ install:
134163
echo 'wxPython is available' ||
135164
echo 'wxPython is not available'
136165
137-
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
138166
pip install $PRE \
139-
pytest!=3.3.0 \
140-
pytest-cov>=2.3.1 \
167+
$PYTEST \
168+
$PYTEST_COV \
141169
pytest-faulthandler \
170+
$PYTEST_PEP8 \
142171
pytest-rerunfailures \
143172
pytest-timeout \
144-
pytest-xdist \
145-
$INSTALL_PEP8
173+
pytest-xdist
146174
147175
# Use the special local version of freetype for testing
148176
cp ci/travis/setup.cfg .

‎INSTALL.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ To run the test suite:
8484
:file:`lib\\mpl_toolkits\\tests` directories from the source distribution;
8585
* install test dependencies: `pytest <https://pypi.python.org/pypi/pytest>`_,
8686
`mock <https://pypi.python.org/pypi/mock>`_, Pillow, MiKTeX, GhostScript,
87-
ffmpeg, avconv, mencoder, ImageMagick, and `Inkscape
88-
<https://inkscape.org/>`_;
87+
ffmpeg, avconv, ImageMagick, and `Inkscape <https://inkscape.org/>`_;
8988
* run ``py.test path\to\tests\directory``.
9089

9190

@@ -171,7 +170,7 @@ Matplotlib requires a large number of dependencies:
171170
* `Python <https://www.python.org/downloads/>`_ (>= 2.7 or >= 3.4)
172171
* `NumPy <http://www.numpy.org>`_ (>= |minimum_numpy_version|)
173172
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`__
174-
* `dateutil <https://pypi.python.org/pypi/python-dateutil>`_ (>= 2.0)
173+
* `dateutil <https://pypi.python.org/pypi/python-dateutil>`_ (>= 2.1)
175174
* `pyparsing <https://pyparsing.wikispaces.com/>`__
176175
* `libpng <http://www.libpng.org>`__ (>= 1.2)
177176
* `pytz <http://pytz.sourceforge.net/>`__

‎ci/travis/test_script.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/bash
22

3-
set -ev
3+
set -ex
44

55
# This script is meant to be called by the "script" step defined in
66
# .travis.yml. See http://docs.travis-ci.com/ for more details.
@@ -16,8 +16,5 @@ if [[ $DELETE_FONT_CACHE == 1 ]]; then
1616
fi
1717

1818
echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
19-
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
20-
pytest $PYTEST_ARGS $RUN_PEP8
21-
else
22-
gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS -m pytest $PYTEST_ARGS $RUN_PEP8
23-
fi
19+
20+
pytest $PYTEST_ARGS $RUN_PEP8

‎doc/_static/mpl_template_example.png

69.2 KB
Loading

‎doc/_static/plotnine.png

27.9 KB
Loading

‎doc/_templates/badgesidebar.html

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎doc/_templates/citing.html

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎doc/_templates/donate_sidebar.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

22
<div>
3-
<div onclick="open_window('MjI1OA==')" class="donate_button">Support matplotlib</div>
4-
<div onclick="open_window('MjM2OA==')" class="donate_button">Support NumFOCUS</div>
3+
<a href="https://www.flipcause.com/secure/cause_pdetails/MjI1OA==" target="_blank"> <div class="donate_button" >Support Matplotlib</div></a>
4+
<a href="https://www.flipcause.com/secure/cause_pdetails/MTY3NTU=" target="_blank"> <div class="donate_button" >Support NumFOCUS</div></a>
55
</div>

0 commit comments

Comments
 (0)