Merge branch 'v2.1.1-doc' into v2.1.x

Author: QuLogic

ci/travis/test_script.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-set -ev
+set -ex
 
 # This script is meant to be called by the "script" step defined in
 # .travis.yml. See http://docs.travis-ci.com/ for more details.
@@ -21,8 +21,5 @@ export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 429496
 echo PYTHONHASHSEED=$PYTHONHASHSEED
 
 echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-  pytest $PYTEST_ARGS $RUN_PEP8
-else
-  gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS -m pytest $PYTEST_ARGS $RUN_PEP8
-fi
+
+pytest $PYTEST_ARGS $RUN_PEP8

doc/_templates/donate_sidebar.html

@@ -1,5 +1,5 @@
 
 <div>
-<div onclick="open_window('MjI1OA==')" class="donate_button">Support matplotlib</div>
-<div onclick="open_window('MjM2OA==')" class="donate_button">Support NumFOCUS</div>
+  <a href="https://www.flipcause.com/secure/cause_pdetails/MjI1OA==" target="_blank"> <div class="donate_button" >Support matplotlib</div></a>
+  <a href="https://www.flipcause.com/secure/cause_pdetails/MTY3NTU=" target="_blank"> <div class="donate_button" >Support NumFOCUS</div></a>
 </div>

doc/_templates/index.html

@@ -175,10 +175,10 @@ <h1>Citing Matplotlib</h1>
 
   <h1>Open source</h1>
   <img src="_static/numfocus_badge.png" alt="A Fiscally Sponsored Project of NUMFocus"
-       style="float:right; margin-left:20px" />
+       style="float:right; margin-left:20px" href="https://numfocus.org"/>
 <p>
 Please
-consider <a href="https://www.flipcause.com/widget/MjI1OA==">donating
+consider <a href="https://www.flipcause.com/secure/cause_pdetails/MjI1OA==" target="_blank">donating
 to the Matplotlib project</a> through the Numfocus organization or to
 the <a href="http://numfocus.org/johnhunter/">John Hunter Technology Fellowship</a>.
 </p>

doc/_templates/layout.html

@@ -344,52 +344,6 @@ <h3>{{ _('Navigation') }}</h3>
 
 </style>
 
-<script>
-
-function open_window(cause_id) {
-var  protocol=String(document.location.protocol);
-var new_url;
-if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)){
-new_url="https://www.flipcause.com/widget/"+cause_id
-window.open(new_url);
-}
-
-else {
-document.getElementById("fc-fade").style.display = "block";
-document.getElementById("fc-fade").style.webkitAnimation = "backfadesin 1s";
-document.getElementById("fc-fade").style.animation = "backfadesin 1s";
-document.getElementById("fc-fade").style.mozAnimation = "backfadesin 1s";
-document.getElementById("fc-light").style.display = "block";
-document.getElementById("fc-light").style.webkitAnimation = "fadesin 1.5s";
-document.getElementById("fc-light").style.animation = "fadesin 1.5s";
-document.getElementById("fc-light").style.mozAnimation = "fadesin 1.5s";
-document.getElementById("fc-main").style.display = "block";
-document.getElementById("fc-main").style.webkitAnimation = "fadesin 1.5s";
-document.getElementById("fc-main").style.animation = "fadesin 1.5s";
-document.getElementById("fc-main").style.mozAnimation = "fadesin 1.5s";
-document.getElementById("fc-close").style.display = "block";
-document.getElementById("fc-close").style.webkitAnimation = "fadesin 1.5s";
-document.getElementById("fc-close").style.animation = "fadesin 1.5s";
-document.getElementById("fc-close").style.mozAnimation = "fadesin 1.5s";
-document.getElementById("fc-myFrame").style.display = "block";
-document.getElementById("fc-myFrame").style.webkitAnimation = "fadesin 1.5s";
-document.getElementById("fc-myFrame").style.animation = "fadesin 1.5s";
-document.getElementById("fc-myFrame").style.mozAnimation = "fadesin 1.5s";
-document.getElementById("fc-myFrame").src="https://www.flipcause.com/widget/"+cause_id;
-}
-}
-
-
-function close_window() {
-document.getElementById("fc-fade").style.display="none";
-document.getElementById("fc-light").style.display="none";
-document.getElementById("fc-main").style.display="none";
-document.getElementById("fc-close").style.display="none";
-document.getElementById("fc-myFrame").style.display="none";
-}
-
-</script>
-
 <div id="fc-fade" class="fc-black_overlay" onclick="close_window()"></div>
 <div id="fc-light" class="fc-white_content">
 <div id="fc-main" class="fc-main-box">