Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5df1e54

Browse filesBrowse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v2.x'
Conflicts: lib/matplotlib/tests/test_image.py - whitespace vs new test conflict - conflicts due to 2.6 work-around on 1.5.x branch
2 parents 43c14a0 + 2aa65ad commit 5df1e54
Copy full SHA for 5df1e54

File tree

Expand file treeCollapse file tree

9 files changed

+258
-41
lines changed
Filter options
Expand file treeCollapse file tree

9 files changed

+258
-41
lines changed

‎INSTALL

Copy file name to clipboardExpand all lines: INSTALL
+11-8Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,28 +190,31 @@ Required Dependencies
190190
:term:`numpy` |minimum_numpy_version| (or later)
191191
array support for python (`download numpy <http://numpy.org>`_)
192192

193+
`setuptools <http://pythonhosted.org/setuptools/>`__
194+
Setuptools provides extensions for python package installation.
195+
193196
:term:`dateutil` 1.1 or later
194197
Provides extensions to python datetime handling. If using pip,
195198
easy_install or installing from source, the installer will attempt
196199
to download and install `python_dateutil` from PyPI.
197200

198-
`pyparsing`
201+
`pyparsing <https://pyparsing.wikispaces.com/>`__
199202
Required for matplotlib's mathtext math rendering support. If
200203
using pip, easy_install or installing from source, the installer
201204
will attempt to download and install `pyparsing` from PyPI.
202205

203-
libpng 1.2 (or later)
206+
`libpng 1.2 (or later) <http://www.libpng.org>`__
204207
library for loading and saving :term:`PNG` files (`download
205208
<http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
206209
zlib.
207210

208-
`pytz`
209-
Used to manipulate time-zone aware datetimes.
211+
`pytz <http://pytz.sourceforge.net/>`__
212+
Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz
210213

211214
:term:`FreeType` 2.3 or later
212215
library for reading true type font files.
213216

214-
``cycler`` 0.9 or later
217+
`cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
215218
Composable cycle class used for constructing style-cycles
216219

217220
`functools32`
@@ -242,11 +245,11 @@ backends and the capabilities they provide.
242245

243246
Optional external programs
244247
^^^^^^^^^^^^^^^^^^^^^^^^^^
245-
ffmpeg/avconv or mencoder
248+
`ffmpeg <https://www.ffmpeg.org/>`__/`avconv <https://libav.org/avconv.html>`__ or `mencoder <http://www.mplayerhq.hu/design7/news.html>`__
246249
Required for the animation module to be save out put to movie
247250
formats.
248251

249-
ImageMagick
252+
`ImageMagick <http://www.imagemagick.org/>`__
250253
Required for the animation module to be able to save to animated gif.
251254

252255
Optional dependencies
@@ -256,7 +259,7 @@ Optional dependencies
256259
If Pillow is installed, matplotlib can read and write a larger
257260
selection of image file formats.
258261

259-
pkg-config
262+
`pkg-config <http://www.freedesktop.org/wiki/Software/pkg-config/>`__
260263
A tool used to find required non-python libraries. This is not strictly
261264
required, but can make installation go more smoothly if the libraries and
262265
headers are not in the expected locations.

‎doc/_static/mpl.css

Copy file name to clipboardExpand all lines: doc/_static/mpl.css
+32Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@ div.sphinxsidebar {
223223
text-align: left;
224224
/* margin-left: -100%; */
225225
}
226+
div.sphinxsidebarwrapper {
227+
padding-top: 28px
228+
}
226229

227230
div.sphinxsidebar h4, div.sphinxsidebar h3 {
228231
margin: 1em 0 0.5em 0;
@@ -650,3 +653,32 @@ figcaption {
650653
}
651654

652655

656+
.donate_button {
657+
background:#11557C;
658+
font-weight:normal;
659+
border:solid 1px #fff;
660+
outline: solid 1px #11557C;
661+
clear: both;
662+
display: block;
663+
width:200px;
664+
line-height:2.8;
665+
font-size: 16px;
666+
text-align: center;
667+
cursor:pointer;
668+
color:#fff;
669+
text-decoration: none;
670+
margin: 30px auto 0;
671+
z-index:1;
672+
transition: background .25s ease;
673+
}
674+
675+
.donate_button:last-of-type {
676+
margin: 15px auto 30px;
677+
678+
679+
}
680+
681+
.donate_button:hover, .donate_button:active, .donate_button:focus {
682+
background: #003c63;
683+
outline-color: #003c63;
684+
}

‎doc/_templates/badgesidebar.html

Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
<a href="http://depsy.org/package/python/matplotlib">
3+
<img src="http://depsy.org/api/package/pypi/matplotlib/badge.svg">
4+
</a>
5+
6+
<br/>
7+
8+
Travis-CI: <a href="https://travis-ci.org/matplotlib/matplotlib">
9+
<img src="https://travis-ci.org/matplotlib/matplotlib.svg?branch=master"/>
10+
</a>
11+
<br/>

‎doc/_templates/donate_sidebar.html

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
<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>
5+
</div>

‎doc/_templates/index.html

Copy file name to clipboardExpand all lines: doc/_templates/index.html
+8-2Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,7 @@ <h1>Open source</h1>
193193
Please
194194
consider <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X9T4KLZT2794S">donating
195195
to the matplotlib project</a> through the Numfocus organization or to
196-
the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial
197-
Fund</a>.
196+
the <a href="http://numfocus.org/johnhunter/">John Hunter Technology Fellowship</a>.
198197
</p>
199198

200199
<p>
@@ -207,6 +206,13 @@ <h1>Open source</h1>
207206
who have made significant <a href="{{ pathto('users/credits') }}">contributions</a>.
208207
</p>
209208

209+
<p>
210+
Matplotlib is hosted on <a href="https://github.com/matplotlib/matplotlib">Github</a>.
211+
<a href="https://github.com/matplotlib/matplotlib/issues">Issues</a> and
212+
<a href="https://github.com/matplotlib/matplotlib/pulls">Pull requests</a>
213+
are tracked at Github too.
214+
</p>
215+
210216

211217
<div class="footnote"><p>
212218
<sup><a name="ftn.matlab" href="#matlab">*</a></sup>

‎doc/_templates/layout.html

Copy file name to clipboardExpand all lines: doc/_templates/layout.html
+150-18Lines changed: 150 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,6 @@ <h3>{{ _('Navigation') }}</h3>
6969
{%- for sidebartemplate in sidebars %}
7070
{%- include sidebartemplate %}
7171
{%- endfor %}
72-
{%- else %}
73-
{#- old style sidebars: using blocks -- should be deprecated #}
74-
{%- block sidebartoc %}
75-
{%- include "localtoc.html" %}
76-
{%- endblock %}
77-
{%- block sidebarrel %}
78-
{%- include "relations.html" %}
79-
{%- endblock %}
80-
{%- block sidebarsourcelink %}
81-
{%- include "sourcelink.html" %}
82-
{%- endblock %}
83-
{%- if customsidebar %}
84-
{%- include customsidebar %}
85-
{%- endif %}
86-
{%- block sidebarsearch %}
87-
{%- include "searchbox.html" %}
88-
{%- endblock %}
8972
{%- endif %}
9073
</div>
9174
</div>
@@ -170,7 +153,7 @@ <h3>{{ _('Navigation') }}</h3>
170153
{%- endif %}
171154
{%- endblock %}
172155
{%- block extrahead %} {% endblock %}
173-
<link href="http://fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
156+
174157

175158
</head>
176159
<body>
@@ -258,4 +241,153 @@ <h3>{{ _('Navigation') }}</h3>
258241

259242
</script>
260243
</body>
244+
<footer>
245+
<!--Flipcause Integration v3.0// Flipcause Integration Instructions:
246+
Install the following code block once in the website Header (after <head> tag) -->
247+
248+
<style>
249+
250+
.fc-black_overlay{
251+
display:none; position: fixed; z-index:1000001; top: 0%;left: 0%;width: 100%;height: 100%;
252+
background-color: black; filter: alpha(opacity=50); cursor:pointer; opacity:0.5;
253+
}
254+
255+
.fc-white_content {
256+
opacity:1; display:none; margin-top: -320px; margin-left: -485px; width:970px; height:640px;
257+
position:fixed; top:50%; left:50%; border: none;z-index:1000002;overflow: auto;
258+
}
259+
260+
.fc-main-box{
261+
opacity:1; display:none; margin:15px auto 0 auto; width:930px; position:relative; z-index:1000003;
262+
}
263+
264+
.fc-widget_close{
265+
opacity:1; content:url(http://i1338.photobucket.com/albums/o691/WeCause/X_zpse4a7e538.png);
266+
position:absolute; z-index=1000004; right:-16px; top:-16px; display:block; cursor:pointer;
267+
}
268+
269+
.floating_button{
270+
display: block; margin-top: 0px; margin-left: 0px; width:auto ; height: auto;
271+
position:fixed; z-index:999999; overflow: auto;
272+
}
273+
274+
@keyframes backfadesin {
275+
from { opacity:0; }
276+
to {opacity:.5;}
277+
}
278+
279+
@-moz-keyframes backfadesin {
280+
from { opacity:0; }
281+
to {opacity:.5;}
282+
}
283+
284+
@-webkit-keyframes backfadesin {
285+
from { opacity:0; }
286+
to {opacity:.5;}
287+
}
288+
289+
@-o-keyframes backfadesin {
290+
from { opacity:0; }
291+
to {opacity:.5;}
292+
}
293+
294+
295+
@-ms-keyframes backfadesin {
296+
from { opacity:0; }
297+
to {opacity:.5;}
298+
}
299+
300+
@keyframes fadesin {
301+
0%{ opacity:0; }
302+
50%{ opacity:0; }
303+
75% {opacity: 0; transform: translateY(20px);}
304+
100% {opacity: 1; transform: translateY(0);}
305+
}
306+
307+
@-moz-keyframes fadesin {
308+
0%{ opacity:0; }
309+
50%{ opacity:0; }
310+
75% {opacity: 0; -moz-transform: translateY(20px);}
311+
100% {opacity: 1; -moz-transform: translateY(0);}
312+
}
313+
314+
@-webkit-keyframes fadesin {
315+
0%{ opacity:0; }
316+
50%{ opacity:0; }
317+
75% {opacity: 0; -webkit-transform: translateY(20px);}
318+
100% {opacity: 1; -webkit-transform: translateY(0);}
319+
}
320+
321+
@-o-keyframes fadesin {
322+
0%{ opacity:0; }
323+
50%{ opacity:0; }
324+
75% {opacity: 0; -o-transform: translateY(20px);}
325+
100% {opacity: 1; -o-transform: translateY(0);}
326+
}
327+
328+
@-ms-keyframes fadesin {
329+
0%{ opacity:0; }
330+
50%{ opacity:0; }
331+
75% {opacity: 0; -ms-transform: translateY(20px);}
332+
100% {opacity: 1; -ms-transform: translateY(0);}
333+
}
334+
335+
</style>
336+
337+
<script>
338+
339+
function open_window(cause_id) {
340+
var protocol=String(document.location.protocol);
341+
var new_url;
342+
if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)){
343+
new_url="https://www.flipcause.com/widget/"+cause_id
344+
window.open(new_url);
345+
}
346+
347+
else {
348+
document.getElementById("fc-fade").style.display = "block";
349+
document.getElementById("fc-fade").style.webkitAnimation = "backfadesin 1s";
350+
document.getElementById("fc-fade").style.animation = "backfadesin 1s";
351+
document.getElementById("fc-fade").style.mozAnimation = "backfadesin 1s";
352+
document.getElementById("fc-light").style.display = "block";
353+
document.getElementById("fc-light").style.webkitAnimation = "fadesin 1.5s";
354+
document.getElementById("fc-light").style.animation = "fadesin 1.5s";
355+
document.getElementById("fc-light").style.mozAnimation = "fadesin 1.5s";
356+
document.getElementById("fc-main").style.display = "block";
357+
document.getElementById("fc-main").style.webkitAnimation = "fadesin 1.5s";
358+
document.getElementById("fc-main").style.animation = "fadesin 1.5s";
359+
document.getElementById("fc-main").style.mozAnimation = "fadesin 1.5s";
360+
document.getElementById("fc-close").style.display = "block";
361+
document.getElementById("fc-close").style.webkitAnimation = "fadesin 1.5s";
362+
document.getElementById("fc-close").style.animation = "fadesin 1.5s";
363+
document.getElementById("fc-close").style.mozAnimation = "fadesin 1.5s";
364+
document.getElementById("fc-myFrame").style.display = "block";
365+
document.getElementById("fc-myFrame").style.webkitAnimation = "fadesin 1.5s";
366+
document.getElementById("fc-myFrame").style.animation = "fadesin 1.5s";
367+
document.getElementById("fc-myFrame").style.mozAnimation = "fadesin 1.5s";
368+
document.getElementById("fc-myFrame").src="https://www.flipcause.com/widget/"+cause_id;
369+
}
370+
}
371+
372+
373+
function close_window() {
374+
document.getElementById("fc-fade").style.display="none";
375+
document.getElementById("fc-light").style.display="none";
376+
document.getElementById("fc-main").style.display="none";
377+
document.getElementById("fc-close").style.display="none";
378+
document.getElementById("fc-myFrame").style.display="none";
379+
}
380+
381+
</script>
382+
383+
<div id="fc-fade" class="fc-black_overlay" onclick="close_window()"></div>
384+
<div id="fc-light" class="fc-white_content">
385+
<div id="fc-main" class="fc-main-box">
386+
<div id="fc-close" class="fc-widget_close" onclick="close_window()">
387+
</div><iframe id="fc-myFrame" iframe height="580" width="925" style="border: 0;
388+
border-radius:5px 5px 5px 5px; box-shadow:0 0 8px rgba(0, 0, 0, 0.5);" scrolling="no" src=""></iframe></div>
389+
</div>
390+
391+
<!--END Flipcause Main Integration Code-->
392+
</footer>
261393
</html>

‎doc/conf.py

Copy file name to clipboardExpand all lines: doc/conf.py
+6-3Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,12 @@
187187
#html_sidebars = {}
188188

189189
# Custom sidebar templates, maps page names to templates.
190-
html_sidebars = {'index': 'indexsidebar.html',
191-
}
192-
190+
html_sidebars = {
191+
'index': ['badgesidebar.html','donate_sidebar.html',
192+
'indexsidebar.html', 'searchbox.html'],
193+
'**': ['badgesidebar.html', 'localtoc.html',
194+
'relations.html', 'sourcelink.html', 'searchbox.html']
195+
}
193196

194197
# Additional templates that should be rendered to pages, maps page names to
195198
# template names.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.