Merge branch 'master' into plot_directive_preserve · matplotlib/matplotlib@e222429 · GitHub
Skip to content

Commit e222429

Browse files
r-barnesr-barnes
committed
Merge branch 'master' into plot_directive_preserve
2 parents 644ce0f + 4753f6c commit e222429

208 files changed

Lines changed: 3780 additions & 3153 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 34 additions & 12 deletions

‎INSTALL.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Matplotlib requires a large number of dependencies:
170170
* `Python <https://www.python.org/downloads/>`_ (>= 2.7 or >= 3.4)
171171
* `NumPy <http://www.numpy.org>`_ (>= |minimum_numpy_version|)
172172
* `setuptools <https://setuptools.readthedocs.io/en/latest/>`__
173-
* `dateutil <https://pypi.python.org/pypi/python-dateutil>`_ (>= 2.0)
173+
* `dateutil <https://pypi.python.org/pypi/python-dateutil>`_ (>= 2.1)
174174
* `pyparsing <https://pyparsing.wikispaces.com/>`__
175175
* `libpng <http://www.libpng.org>`__ (>= 1.2)
176176
* `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-requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
sphinx>=1.3,!=1.5.0,!=1.6.4
1010
colorspacious
1111
ipython
12+
ipywidgets
1213
mock
1314
numpydoc>=0.4
1415
pillow

‎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>

‎doc/_templates/layout.html‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -344,52 +344,6 @@ <h3>{{ _('Navigation') }}</h3>
344344

345345
</style>
346346

347-
<script>
348-
349-
function open_window(cause_id) {
350-
var protocol=String(document.location.protocol);
351-
var new_url;
352-
if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)){
353-
new_url="https://www.flipcause.com/widget/"+cause_id
354-
window.open(new_url);
355-
}
356-
357-
else {
358-
document.getElementById("fc-fade").style.display = "block";
359-
document.getElementById("fc-fade").style.webkitAnimation = "backfadesin 1s";
360-
document.getElementById("fc-fade").style.animation = "backfadesin 1s";
361-
document.getElementById("fc-fade").style.mozAnimation = "backfadesin 1s";
362-
document.getElementById("fc-light").style.display = "block";
363-
document.getElementById("fc-light").style.webkitAnimation = "fadesin 1.5s";
364-
document.getElementById("fc-light").style.animation = "fadesin 1.5s";
365-
document.getElementById("fc-light").style.mozAnimation = "fadesin 1.5s";
366-
document.getElementById("fc-main").style.display = "block";
367-
document.getElementById("fc-main").style.webkitAnimation = "fadesin 1.5s";
368-
document.getElementById("fc-main").style.animation = "fadesin 1.5s";
369-
document.getElementById("fc-main").style.mozAnimation = "fadesin 1.5s";
370-
document.getElementById("fc-close").style.display = "block";
371-
document.getElementById("fc-close").style.webkitAnimation = "fadesin 1.5s";
372-
document.getElementById("fc-close").style.animation = "fadesin 1.5s";
373-
document.getElementById("fc-close").style.mozAnimation = "fadesin 1.5s";
374-
document.getElementById("fc-myFrame").style.display = "block";
375-
document.getElementById("fc-myFrame").style.webkitAnimation = "fadesin 1.5s";
376-
document.getElementById("fc-myFrame").style.animation = "fadesin 1.5s";
377-
document.getElementById("fc-myFrame").style.mozAnimation = "fadesin 1.5s";
378-
document.getElementById("fc-myFrame").src="https://www.flipcause.com/widget/"+cause_id;
379-
}
380-
}
381-
382-
383-
function close_window() {
384-
document.getElementById("fc-fade").style.display="none";
385-
document.getElementById("fc-light").style.display="none";
386-
document.getElementById("fc-main").style.display="none";
387-
document.getElementById("fc-close").style.display="none";
388-
document.getElementById("fc-myFrame").style.display="none";
389-
}
390-
391-
</script>
392-
393347
<div id="fc-fade" class="fc-black_overlay" onclick="close_window()"></div>
394348
<div id="fc-light" class="fc-white_content">
395349
<div id="fc-main" class="fc-main-box">

‎doc/api/animation_api.rst‎

Lines changed: 33 additions & 48 deletions

0 commit comments

Comments
 (0)