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

Skip to content

Commit 60bbe9b

Browse files
author
Salil Vanvari
committed
Retry
2 parents 24b5266 + ba019f7 commit 60bbe9b

File tree

366 files changed

+4028
-9093
lines changed

Some content is hidden

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

366 files changed

+4028
-9093
lines changed

‎.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ matrix:
6767
env: BUILD_DOCS=true
6868
- python: 3.5
6969
env: USE_PYTEST=true PANDAS=pandas DELETE_FONT_CACHE=1 TEST_ARGS=
70+
- python: "3.6-dev"
71+
env: PRE=--pre
7072
- python: "nightly"
7173
env: PRE=--pre
7274
- os: osx
@@ -89,7 +91,8 @@ before_install:
8991
- |
9092
# Install into our own pristine virtualenv
9193
if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
92-
virtualenv --python=python venv
94+
pip install --upgrade virtualenv
95+
python -m virtualenv venv
9396
source venv/bin/activate
9497
export PATH=/usr/lib/ccache:$PATH
9598
else
@@ -112,7 +115,7 @@ install:
112115
pip install --upgrade setuptools
113116
- |
114117
# Install dependencies from pypi
115-
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.6 $PANDAS pep8 cycler coveralls coverage
118+
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.6 $PANDAS pep8 cycler coveralls coverage $MOCK
116119
pip install $PRE -r doc-requirements.txt
117120
118121
# Install nose from a build which has partial
@@ -179,9 +182,6 @@ script:
179182
pip install $PRE requests==2.9.2 linkchecker
180183
linkchecker build/html/index.html
181184
fi
182-
# Currently disabled because of differece in behaviour
183-
# between `pytest-cov` and `nose-coverage`
184-
#- if [[ $USE_PYTEST == true ]]; then coveralls; fi
185185
- rm -rf $HOME/.cache/matplotlib/tex.cache
186186
- rm -rf $HOME/.cache/matplotlib/test_cache
187187

@@ -222,6 +222,6 @@ after_success:
222222
else
223223
echo "Will only deploy docs build from matplotlib master branch"
224224
fi
225-
if [[ $NOSE_ARGS =~ "--with-coverage" ]]; then
225+
if [[ $NOSE_ARGS =~ "--with-coverage" || $USE_PYTEST == true ]]; then
226226
coveralls
227227
fi

‎LICENSE/LICENSE.PIL

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Software License
2+
3+
The Python Imaging Library (PIL) is
4+
5+
Copyright © 1997-2011 by Secret Labs AB
6+
Copyright © 1995-2011 by Fredrik Lundh
7+
8+
By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply with the following terms and conditions:
9+
10+
Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Secret Labs AB or the author not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.
11+
12+
SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

‎README.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ application servers, and various graphical user interface toolkits.
1313
Installation
1414
=============
1515

16-
For installation instructions and requirements, see the INSTALL file.
16+
For installation instructions and requirements, see the INSTALL file or the `install <http://matplotlib.org/users/installing.html>`_ documentation. If you think you may want to contribute to matplotlib, check out the `guide to working with the source code <http://matplotlib.org/devel/gitwash/index.html>`_.
1717

1818
Testing
1919
=======
@@ -56,6 +56,4 @@ You've worked out a way to fix it – even better!
5656

5757
You want to tell us about it – best of all!
5858

59-
The easiest way to contribute is through GitHub; if interested in doing so, browse the `development workflow <http://matplotlib.org/devel/gitwash/development_workflow.html>`_ guide.
60-
61-
If you don't want to submit your changes via Github, take a look at the guide to `making patches <http://matplotlib.org/devel/gitwash/patching.html>`_.
59+
Start at the `contributing guide <http://matplotlib.org/devdocs/devel/contributing.html>`_!

‎ci/conda_recipe/run_test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import os
2-
import platform
2+
import platform
33
import sys
44

55
import matplotlib
66
import matplotlib.pyplot
77
import matplotlib._cntr
8-
import matplotlib._delaunay
98
import matplotlib._image
109
import matplotlib._path
1110
import matplotlib._png

‎doc/_static/mpl.css

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,19 @@ div.admonition, div.warning {
357357
font-size: 0.9em;
358358
}
359359

360+
div.warning {
361+
color: #b94a48;
362+
background-color: #F3E5E5;
363+
border: 1px solid #eed3d7;
364+
}
365+
366+
div.green {
367+
color: #468847;
368+
background-color: #dff0d8;
369+
border: 1px solid #d6e9c6;
370+
}
371+
372+
360373
div.admonition p, div.warning p {
361374
margin: 0.5em 1em 0.5em 1em;
362375
padding: 0;
@@ -366,19 +379,57 @@ div.admonition pre, div.warning pre {
366379
margin: 0.4em 1em 0.4em 1em;
367380
}
368381

382+
div.admonition p.admonition-title + p {
383+
display: inline;
384+
}
385+
386+
369387
div.admonition p.admonition-title,
370388
div.warning p.admonition-title {
371389
margin: 0;
372390
font-weight: bold;
373391
font-size: 14px;
374392
}
375393

394+
div.admonition {
395+
margin-bottom: 10px;
396+
margin-top: 10px;
397+
padding: 7px;
398+
border-radius: 4px;
399+
-moz-border-radius: 4px;
400+
}
401+
402+
403+
div.note {
404+
background-color: #eee;
405+
border: 1px solid #ccc;
406+
}
407+
408+
div.topic {
409+
background-color: #eee;
410+
border: 1px solid #CCC;
411+
margin: 10px 0px;
412+
padding: 7px 7px 0px;
413+
border-radius: 4px;
414+
-moz-border-radius: 4px;
415+
}
416+
417+
p.topic-title {
418+
font-size: 1.1em;
419+
font-weight: bold;
420+
}
421+
422+
div.seealso {
423+
background-color: #FFFBE8;
424+
border: 1px solid #fbeed5;
425+
color: #AF8A4B;
426+
}
427+
376428
div.warning {
377429
border: 1px solid #940000;
378430
}
379431

380432
div.warning p.admonition-title {
381-
background-color: #CF0000;
382433
border-bottom-color: #940000;
383434
}
384435

‎doc/_templates/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ <h1>Third party packages</h1>
180180

181181
<p>A large number of <a href="{{ pathto('thirdpartypackages/index') }}">third party packages</a>
182182
extend and build on Matplotlib functionality, including several higher-level plotting interfaces
183-
<a href="http://web.stanford.edu/~mwaskom/software/seaborn">seaborn</a>,
183+
<a href="https://seaborn.github.io/">seaborn</a>,
184184
<a href="http://holoviews.org">holoviews</a>,
185185
<a href="http://ggplot.yhathq.com">ggplot</a>, and
186186
two projection and mapping toolkits

‎doc/api/api_changes.rst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,34 @@ where "ax" is an ``Axes3d`` object created with something like ::
155155
ax = plt.sublot(111, projection='3d')
156156

157157

158+
Changes in 1.5.3
159+
================
160+
161+
``ax.plot(..., marker=None)`` gives default marker
162+
--------------------------------------------------
163+
164+
Prior to 1.5.3 kwargs passed to `~matplotlib.Axes.plot` were handled
165+
in two parts -- default kwargs generated internal to
166+
`~matplotlib.Axes.plot` (such as the cycled styles) and user supplied
167+
kwargs. The internally generated kwargs were passed to the
168+
`matplotlib.lines.Line2D.__init__` and the user kwargs were passed to
169+
``ln.set(**kwargs)`` to update the artist after it was created. Now
170+
both sets of kwargs are merged and passed to
171+
`~matplotlib.lines.Line2D.__init__`. This change was made to allow `None`
172+
to be passed in via the user kwargs to mean 'do the default thing' as
173+
is the convention through out mpl rather than raising an exception.
174+
175+
Unlike most `~matplotlib.lines.Line2D` setter methods
176+
`~matplotlib.lines.Line2D.set_marker` did accept `None` as a valid
177+
input which was mapped to 'no marker'. Thus, by routing this
178+
``marker=None`` through ``__init__`` rather than ``set(...)`` the meaning
179+
of ``ax.plot(..., marker=None)`` changed from 'no markers' to 'default markers
180+
from rcparams'.
181+
182+
This is change is only evident if ``mpl.rcParams['lines.marker']`` has a value
183+
other than ``'None'`` (which is string ``'None'`` which means 'no marker').
184+
185+
158186
Changes in 1.5.2
159187
================
160188

‎doc/api/api_changes/code_removal.rst

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Code Removal
2+
````````````
3+
4+
matplotlib.delaunay
5+
-------------------
6+
Remove the delaunay triangulation code which is now handled by Qhull
7+
via ``matplotlib.tri``
8+
9+
10+
qt4_compat.py
11+
-------------
12+
Moved to ``qt_compat.py``. Renamed because it now handles Qt5 as well.
13+
14+
15+
Deprecated methods
16+
------------------
17+
18+
The ``GraphicsContextBase.set_graylevel``, ``FigureCanvasBase.onHilite`` and
19+
``mpl_toolkits.axes_grid1.mpl_axes.Axes.toggle_axisline`` methods have been
20+
removed.
21+
22+
23+
`Axes.set_aspect("normal")`
24+
---------------------------
25+
26+
Support for setting an ``Axes``' aspect to ``"normal"`` has been removed, in
27+
favor of the synonym ``"auto"``.

‎doc/api/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
text_api.rst
5252
ticker_api.rst
5353
tight_layout_api.rst
54+
transformations.rst
5455
tri_api.rst
5556
type1font.rst
5657
units_api.rst

‎doc/devel/transformations.rst renamed to ‎doc/api/transformations.rst

File renamed without changes.

0 commit comments

Comments
 (0)