Merge pull request #14254 from tacaswell/merge_up_30x

tacaswell · web-flow · commit 035e19b1f2e4 · 2019-05-20T18:51:57.000-04:00
MNT: Merge up v3.0.x and v3.0.0-doc branch to v3.1.x
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -869,6 +869,12 @@ figcaption {
 }
 
 
+
+#plotting-contest a {
+  color: #fff;
+  text-decoration:underline;
+}
+
 /* "Go to released version" message. */
 #unreleased-message {
   background: #d62728;
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -184,6 +184,11 @@ <h3>{{ _('Navigation') }}</h3>
     </a>
 </div>
 {%- endif %}
+<div id="plotting-contest" style="padding: 6px; background-color: teal; color: white;">
+<p style="margin: 0;">The 2019 SciPy John Hunter Excellence in Plotting Contest is accepting submissions! 
+  <br />
+  <a href="https://docs.google.com/forms/d/e/1FAIpQLSe-_AnKvYSzeQWfNDRoXgW0vl7_8q6jj3QbLIac8eUcb9lSAA/viewform?usp=sf_link" style="font-weight: bold;">Apply by June 8th</a></p>
+</div>
 
 <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px; position: relative;">
 {%- if builder in ('htmlhelp', 'devhelp', 'latex') %}
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -27,6 +27,16 @@ pp. 90-95, 2007 <https://doi.org/10.1109/MCSE.2007.55>`_.
 
 DOIs
 ----
+
+v3.0.3
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2577644.svg
+      :target: https://doi.org/10.5281/zenodo.2577644
+v3.0.2
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482099.svg
+      :target: https://doi.org/10.5281/zenodo.1482099
+v3.0.1
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1482098.svg
+      :target: https://doi.org/10.5281/zenodo.1482098
 v3.0.0
    .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1420605.svg
       :target: https://doi.org/10.5281/zenodo.1420605
diff --git a/doc/users/github_stats.rst b/doc/users/github_stats.rst
@@ -1250,3 +1250,15 @@ Issues (161):
 * :ghissue:`11587`: Missing filled contours when using contourf
 * :ghissue:`11716`: errorbar pickling fails when specifying y error bars
 * :ghissue:`11557`: Hoping add a drawing function 'patch'  in matplotlib
+
+
+
+Previous Github Stats
+---------------------
+
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    prev_whats_new/github_stats_*
diff --git a/doc/users/prev_whats_new/github_stats_3.0.2.rst b/doc/users/prev_whats_new/github_stats_3.0.2.rst
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -397,7 +397,7 @@ def xkcd(scale=1, length=100, randomness=2):
 
     from matplotlib import patheffects
     return rc_context({
-        'font.family': ['xkcd', 'Humor Sans', 'Comic Sans MS'],
+        'font.family': ['xkcd', 'xkcd Script', 'Humor Sans', 'Comic Sans MS'],
         'font.size': 14.0,
         'path.sketch': (scale, length, randomness),
         'path.effects': [patheffects.withStroke(linewidth=4, foreground="w")],
diff --git a/tools/gh_api.py b/tools/gh_api.py
@@ -71,7 +71,7 @@ def get_auth_token():
     return token
 
 def make_auth_header():
-    return {'Authorization': 'token ' + get_auth_token()}
+    return {'Authorization': 'token ' + get_auth_token().replace("\n","")}
 
 def post_issue_comment(project, num, body):
     url = 'https://api.github.com/repos/{project}/issues/{num}/comments'.format(project=project, num=num)
