package/ci: drop Python 3.5 testing, add 3.8 to 3.10.

Python 3.5 was EOL'd in September 2020 and support for it is being
removed from major packages like pybind. It was also the only version
on which neither the Doxygen nor Python doc generator worked due to lack
of typing annotations, and since those two are the major use cases, I
don't think there's many users relying still on 3.5.

Python 3.6 was EOL'd in December 2021 so *technically* I could drop it
as well, however Ubuntu 18.04 LTS still has it as the default version so
it's good to keep it. I don't really need to use any 3.7-specific
features yet either, so this isn't a problem.

diff --git a/doc/build-status.html.in b/doc/build-status.html.in
index 66a90d81721d42f8f613ee567ae92168a88e429f..49de282fa5369a3561078a4e282875fd3ff07c96 100644 (file)
--- a/doc/build-status.html.in
+++ b/doc/build-status.html.in
@@ -2,21 +2,25 @@
   <thead>
     <tr>
       <th style="border-bottom-width: 0;"></th>
-      <th>Python<br />3.5</th>
       <th>Python<br />3.6</th>
       <th>Python<br />3.7</th>
+      <th>Python<br />3.8</th>
+      <th>Python<br />3.9</th>
+      <th>Python<br />3.10</th>
     </tr>
     <tr>
       <th class="m-text-right m-text-middle" style="border-top-width: 0;">code coverage</th>
-      <td colspan="3" id="coverage-mcss"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td colspan="5" id="coverage-mcss"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
     </tr>
   </thead>
   <tbody>
     <tr>
       <th class="m-text-right">Pelican theme</th>
-      <td rowspan="3" id="mcss-py35"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
-      <td rowspan="4" id="mcss-py36"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
-      <td rowspan="4" id="mcss-py37"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td rowspan="4" id="mcss-py306"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td rowspan="4" id="mcss-py307"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td rowspan="4" id="mcss-py308"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td rowspan="4" id="mcss-py309"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td rowspan="4" id="mcss-py310"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
     </tr>
     <tr>
       <th class="m-text-right">Plugins</th>
@@ -26,18 +30,18 @@
     </tr>
     <tr>
       <th class="m-text-right">Documentation themes</th>
-      <td class="m-dim"></td>
     </tr>
     <tr>
       <th class="m-text-right">Documentation themes<br/>client search</th>
-      <td class="m-dim"></td>
-      <td id="mcss-js" colspan="2"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
+      <td id="mcss-js" colspan="5"><a>&nbsp;<br/><span class="m-text m-small">&nbsp;</span></a></td>
     </tr>
     <tr>
       <th class="m-text-right">Math rendering</th>
       <td class="m-dim"></td>
       <td class="m-dim"></td>
       <td class="m-dim"></td>
+      <td class="m-dim"></td>
+      <td class="m-dim"></td>
     </tr>
   </tbody>
 </table>

diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index e260518893c35adbd0b204da6be5d92d9c3124c6..5d14f9a9eac2d9df04d185e6bc016fbd92c4757c 100644 (file)
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -10,15 +10,21 @@ notify:
     #- url: https://webhooks.gitter.im/e/cfbadbd34d28708a57c6
 
 executors:
-  python-3_5:
+  python-3_06:
     docker:
-    - image: python:3.5.10
-  python-3_6:
+    - image: python:3.6.15
+  python-3_07:
     docker:
-    - image: python:3.6.12
-  python-3_7:
+    - image: python:3.7.12
+  python-3_08:
     docker:
-    - image: python:3.7.9
+    - image: python:3.8.12
+  python-3_09:
+    docker:
+    - image: python:3.9.8
+  python-3_10:
+    docker:
+    - image: python:3.10.1
   node-10:
     docker:
     - image: node:10.24.0-buster-slim
@@ -171,19 +177,24 @@ commands:
           codecov
 
 jobs:
-  py35:
-    executor: python-3_5
+  py306:
+    executor: python-3_06
     steps:
     - install-base:
-        extra: graphviz
-    - install-python-deps
+        extra: graphviz cmake ninja-build wget
+    - install-python-deps:
+        matplotlib-version: ==3.3.4
+        extra: attrs==19.3.0
     - checkout
     - test-theme
     - test-plugins
+    - test-documentation-themes:
+        python-version: "3.6"
+        pybind-version: "2.2.4"
     - coverage
 
-  py36:
-    executor: python-3_6
+  py307:
+    executor: python-3_07
     steps:
     - install-base:
         extra: graphviz cmake ninja-build wget
@@ -194,12 +205,12 @@ jobs:
     - test-theme
     - test-plugins
     - test-documentation-themes:
-        python-version: "3.6"
-        pybind-version: "2.2.4"
+        python-version: "3.7"
+        pybind-version: "2.3.0"
     - coverage
 
-  py37:
-    executor: python-3_7
+  py308:
+    executor: python-3_08
     steps:
     - install-base:
         extra: graphviz cmake ninja-build wget
@@ -210,8 +221,46 @@ jobs:
     - test-theme
     - test-plugins
     - test-documentation-themes:
-        python-version: "3.7"
-        pybind-version: "2.3.0"
+        python-version: "3.8"
+        # 2.4.1 fixes a Py3.8-specific bug, so the 2.3 versions are probably
+        # not wise to use here
+        pybind-version: "2.4.3"
+    - coverage
+
+  py309:
+    executor: python-3_09
+    steps:
+    - install-base:
+        extra: graphviz cmake ninja-build wget
+    - install-python-deps:
+        matplotlib-version: ==3.3.4
+        extra: attrs==19.3.0
+    - checkout
+    - test-theme
+    - test-plugins
+    - test-documentation-themes:
+        python-version: "3.9"
+        # 2.5.0 is the first that properly searches for Python 3.9 in CMake, so
+        # anything before that probably won't work at all.
+        pybind-version: "2.5.0"
+    - coverage
+
+  py310:
+    executor: python-3_10
+    steps:
+    - install-base:
+        extra: graphviz cmake ninja-build wget
+    - install-python-deps:
+        matplotlib-version: ==3.3.4
+        extra: attrs==19.3.0
+    - checkout
+    - test-theme
+    - test-plugins
+    - test-documentation-themes:
+        python-version: "3.10"
+        # Python 3.10 and Pybind 2.8 were both released on 2021-10-04, so
+        # assume anything older won't really work there.
+        pybind-version: "2.8.0"
     - coverage
 
   js:
@@ -229,7 +278,9 @@ workflows:
   version: 2
   build:
     jobs:
-    - py35
-    - py36
-    - py37
+    - py306
+    - py307
+    - py308
+    - py309
+    - py310
     - js

diff --git a/plugins/m/test/plots/page-py35.html b/plugins/m/test/plots/page-py35.html
deleted file mode 100644 (file)
index 0d64be2..0000000
--- a/plugins/m/test/plots/page-py35.html
+++ /dev/null
@@ -1,682 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <title>m.plots | A Pelican Blog</title>
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i" />
-  <link rel="stylesheet" href="static/m-dark.css" />
-  <link rel="canonical" href="page.html" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-</head>
-<body>
-<header><nav id="navigation">
-  <div class="m-container">
-    <div class="m-row">
-      <a href="./" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">A Pelican Blog</a>
-    </div>
-  </div>
-</nav></header>
-<main>
-<article>
-  <div class="m-container m-container-inflatable">
-    <div class="m-row">
-      <div class="m-col-l-10 m-push-l-1">
-        <h1>m.plots</h1>
-<!-- content -->
-<p>Note: the test uses DejaVu Sans instead of Source Sans Pro in order to have
-predictable rendering on the CIs.</p>
-<style>
-div.m-plot svg { font-family: DejaVu Sans; }
-</style><div class="m-plot">
-<svg viewBox="0 0 576 113.76">
- <defs>
-  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
- </defs>
- <g id="figure_1">
-  <g id="axes_1">
-   <g id="patch_1">
-    <path d="M 59.365156 69.588125 L 560.62 69.588125 L 560.62 27.757969 L 59.365156 27.757969 z" class="m-background"/>
-   </g>
-   <g id="plot1-value0-0"><title>15.0 meters, i guess?</title>
-    <path clip-path="url(#p2abd2612b1)" d="M 59.365156 29.659339 L 298.057939 29.659339 L 298.057939 46.560413 L 59.365156 46.560413 z" class="m-bar m-success"/>
-   </g>
-   <g id="plot1-value0-1"><title>30.0 meters, i guess?</title>
-    <path clip-path="url(#p2abd2612b1)" d="M 59.365156 50.785681 L 536.750722 50.785681 L 536.750722 67.686754 L 59.365156 67.686754 z" class="m-bar m-success"/>
-   </g>
-   <g id="matplotlib.axis_1">
-    <g id="xtick_1">
-     <g id="line2d_1">
-      <defs>
-       <path d="M 0 0 L 0 3.5" id="m15f0a304df" class="m-line"/>
-      </defs>
-      <g>
-       <use x="59.365156" xlink:href="#m15f0a304df" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_1">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 59.365156, 84.946406)" x="59.365156" y="84.946406">0</text>
-     </g>
-    </g>
-    <g id="xtick_2">
-     <g id="line2d_2">
-      <g>
-       <use x="138.929417" xlink:href="#m15f0a304df" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_2">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 138.929417, 84.946406)" x="138.929417" y="84.946406">5</text>
-     </g>
-    </g>
-    <g id="xtick_3">
-     <g id="line2d_3">
-      <g>
-       <use x="218.493678" xlink:href="#m15f0a304df" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_3">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 218.493678, 84.946406)" x="218.493678" y="84.946406">10</text>
-     </g>
-    </g>
-    <g id="xtick_4">
-     <g id="line2d_4">
-      <g>
-       <use x="298.057939" xlink:href="#m15f0a304df" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_4">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 298.057939, 84.946406)" x="298.057939" y="84.946406">15</text>
-     </g>
-    </g>
-    <g id="xtick_5">
-     <g id="line2d_5">
-      <g>
-       <use x="377.6222" xlink:href="#m15f0a304df" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_5">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 377.6222, 84.946406)" x="377.6222" y="84.946406">20</text>
-     </g>
-    </g>
-    <g id="xtick_6">
-     <g id="line2d_6">
-      <g>
-       <use x="457.186461" xlink:href="#m15f0a304df" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_6">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 457.186461, 84.946406)" x="457.186461" y="84.946406">25</text>
-     </g>
-    </g>
-    <g id="xtick_7">
-     <g id="line2d_7">
-      <g>
-       <use x="536.750722" xlink:href="#m15f0a304df" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_7">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 536.750722, 84.946406)" x="536.750722" y="84.946406">30</text>
-     </g>
-    </g>
-    <g id="text_8">
-     <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 309.992578, 99.592344)" x="309.992578" y="99.592344">meters, i guess?</text>
-    </g>
-   </g>
-   <g id="matplotlib.axis_2">
-    <g id="ytick_1">
-     <g id="line2d_8">
-      <defs>
-       <path d="M 0 0 L -3.5 0" id="mba4ce04b6c" class="m-line"/>
-      </defs>
-      <g>
-       <use x="59.365156" xlink:href="#mba4ce04b6c" y="38.109876"/>
-      </g>
-     </g>
-     <g id="text_9">
-      <text class="m-label" style="text-anchor:end;" transform="rotate(-0, 52.365156, 42.289017)" x="52.365156" y="42.289017">First</text>
-     </g>
-    </g>
-    <g id="ytick_2">
-     <g id="line2d_9">
-      <g>
-       <use x="59.365156" xlink:href="#mba4ce04b6c" y="59.236218"/>
-      </g>
-     </g>
-     <g id="text_10">
-      <text class="m-label" style="text-anchor:end;" transform="rotate(-0, 52.365156, 63.415358)" x="52.365156" y="63.415358">Second</text>
-     </g>
-    </g>
-   </g>
-   <g id="text_11">
-    <text class="m-title" style="text-anchor:middle;" transform="rotate(-0, 309.992578, 21.757969)" x="309.992578" y="21.757969">A plot with a single color</text>
-   </g>
-  </g>
- </g>
- <defs>
-  <clipPath id="p2abd2612b1">
-   <rect height="41.830156" width="501.254844" x="59.365156" y="27.757969"/>
-  </clipPath>
- </defs>
-</svg>
-</div>
-<div class="m-col-m-6 m-center-m">
-<p>A plot with separate colors, extra labels, error bars and custom width + height</p>
-<div class="m-plot">
-<svg viewBox="0 0 324 218.16">
- <defs>
-  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
- </defs>
- <g id="figure_1">
-  <g id="axes_1">
-   <g id="patch_1">
-    <path d="M 76.642031 173.988125 L 308.62 173.988125 L 308.62 27.757969 L 76.642031 27.757969 z" class="m-background"/>
-   </g>
-   <g id="plot2-value0-0"><title>3.0 ± 0.1 Mondays</title>
-    <path clip-path="url(#p951bbe7ab0)" d="M 76.642031 34.404794 L 185.296818 34.404794 L 185.296818 72.386653 L 76.642031 72.386653 z" class="m-bar m-success"/>
-   </g>
-   <g id="plot2-value0-1"><title>4.0 ± 2.1 Mondays</title>
-    <path clip-path="url(#p951bbe7ab0)" d="M 76.642031 81.882117 L 221.51508 81.882117 L 221.51508 119.863976 L 76.642031 119.863976 z" class="m-bar m-info"/>
-   </g>
-   <g id="plot2-value0-2"><title>5.0 ± 1.0 Mondays</title>
-    <path clip-path="url(#p951bbe7ab0)" d="M 76.642031 129.359441 L 257.733342 129.359441 L 257.733342 167.3413 L 76.642031 167.3413 z" class="m-bar m-danger"/>
-   </g>
-   <g id="matplotlib.axis_1">
-    <g id="xtick_1">
-     <g id="line2d_1">
-      <defs>
-       <path d="M 0 0 L 0 3.5" id="m7a9c636c50" class="m-line"/>
-      </defs>
-      <g>
-       <use x="76.642031" xlink:href="#m7a9c636c50" y="173.988125"/>
-      </g>
-     </g>
-     <g id="text_1">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 76.642031, 189.346406)" x="76.642031" y="189.346406">0</text>
-     </g>
-    </g>
-    <g id="xtick_2">
-     <g id="line2d_2">
-      <g>
-       <use x="112.860293" xlink:href="#m7a9c636c50" y="173.988125"/>
-      </g>
-     </g>
-     <g id="text_2">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 112.860293, 189.346406)" x="112.860293" y="189.346406">1</text>
-     </g>
-    </g>
-    <g id="xtick_3">
-     <g id="line2d_3">
-      <g>
-       <use x="149.078555" xlink:href="#m7a9c636c50" y="173.988125"/>
-      </g>
-     </g>
-     <g id="text_3">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 149.078555, 189.346406)" x="149.078555" y="189.346406">2</text>
-     </g>
-    </g>
-    <g id="xtick_4">
-     <g id="line2d_4">
-      <g>
-       <use x="185.296818" xlink:href="#m7a9c636c50" y="173.988125"/>
-      </g>
-     </g>
-     <g id="text_4">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 185.296818, 189.346406)" x="185.296818" y="189.346406">3</text>
-     </g>
-    </g>
-    <g id="xtick_5">
-     <g id="line2d_5">
-      <g>
-       <use x="221.51508" xlink:href="#m7a9c636c50" y="173.988125"/>
-      </g>
-     </g>
-     <g id="text_5">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 221.51508, 189.346406)" x="221.51508" y="189.346406">4</text>
-     </g>
-    </g>
-    <g id="xtick_6">
-     <g id="line2d_6">
-      <g>
-       <use x="257.733342" xlink:href="#m7a9c636c50" y="173.988125"/>
-      </g>
-     </g>
-     <g id="text_6">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 257.733342, 189.346406)" x="257.733342" y="189.346406">5</text>
-     </g>
-    </g>
-    <g id="xtick_7">
-     <g id="line2d_7">
-      <g>
-       <use x="293.951604" xlink:href="#m7a9c636c50" y="173.988125"/>
-      </g>
-     </g>
-     <g id="text_7">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 293.951604, 189.346406)" x="293.951604" y="189.346406">6</text>
-     </g>
-    </g>
-    <g id="text_8">
-     <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 192.631016, 203.992344)" x="192.631016" y="203.992344">Mondays</text>
-    </g>
-   </g>
-   <g id="matplotlib.axis_2">
-    <g id="ytick_1">
-     <g id="line2d_8">
-      <defs>
-       <path d="M 0 0 L -3.5 0" id="m03b20617ea" class="m-line"/>
-      </defs>
-      <g>
-       <use x="76.642031" xlink:href="#m03b20617ea" y="53.395723"/>
-      </g>
-     </g>
-     <g id="text_9">
-      <text class="m-label" transform="translate(27.94 51.416067)">January</text>
-      <text class="m-label" transform="translate(69.642031 63.733661)"/>
-     </g>
-    </g>
-    <g id="ytick_2">
-     <g id="line2d_9">
-      <g>
-       <use x="76.642031" xlink:href="#m03b20617ea" y="100.873047"/>
-      </g>
-     </g>
-     <g id="text_10">
-      <text class="m-label" style="text-anchor:end;" transform="rotate(-0, 69.642031, 105.052188)" x="69.642031" y="105.052188">February</text>
-     </g>
-    </g>
-    <g id="ytick_3">
-     <g id="line2d_10">
-      <g>
-       <use x="76.642031" xlink:href="#m03b20617ea" y="148.35037"/>
-      </g>
-     </g>
-     <g id="text_11">
-      <text class="m-label" transform="translate(35.872031 146.370714)">March</text>
-      <text class="m-label" transform="translate(69.642031 158.688308)"/>
-     </g>
-    </g>
-   </g>
-   <g id="LineCollection_1">
-    <path clip-path="url(#p951bbe7ab0)" d="M 181.674991 53.395723 L 188.918644 53.395723" class="m-error"/>
-    <path clip-path="url(#p951bbe7ab0)" d="M 145.456729 100.873047 L 297.57343 100.873047" class="m-error"/>
-    <path clip-path="url(#p951bbe7ab0)" d="M 221.51508 148.35037 L 293.951604 148.35037" class="m-error"/>
-   </g>
-   <g id="line2d_11">
-    <defs>
-     <path d="M 0 9.375 L 0 -9.375" id="m63fa77ade3" class="m-error"/>
-    </defs>
-    <g clip-path="url(#p951bbe7ab0)">
-     <use x="181.674991" xlink:href="#m63fa77ade3" y="53.395723"/>
-     <use x="145.456729" xlink:href="#m63fa77ade3" y="100.873047"/>
-     <use x="221.51508" xlink:href="#m63fa77ade3" y="148.35037"/>
-    </g>
-   </g>
-   <g id="line2d_12">
-    <g clip-path="url(#p951bbe7ab0)">
-     <use x="188.918644" xlink:href="#m63fa77ade3" y="53.395723"/>
-     <use x="297.57343" xlink:href="#m63fa77ade3" y="100.873047"/>
-     <use x="293.951604" xlink:href="#m63fa77ade3" y="148.35037"/>
-    </g>
-   </g>
-   <g id="text_12">
-    <text class="m-label m-dim" transform="translate(69.642031 52.646105)"/>
-    <text class="m-label m-dim" transform="translate(11.88 64.963699)">a paradise</text>
-   </g>
-   <g id="text_13">
-    <text class="m-label m-dim" transform="translate(69.642031 147.600752)"/>
-    <text class="m-label m-dim" transform="translate(45.380156 159.918346)">hell!</text>
-   </g>
-   <g id="text_14">
-    <text class="m-title" style="text-anchor:middle;" transform="rotate(-0, 192.631016, 21.757969)" x="192.631016" y="21.757969">Yes.</text>
-   </g>
-  </g>
- </g>
- <defs>
-  <clipPath id="p951bbe7ab0">
-   <rect height="146.230156" width="231.977969" x="76.642031" y="27.757969"/>
-  </clipPath>
- </defs>
-</svg>
-</div>
-</div>
-<div class="m-plot">
-<svg viewBox="0 0 576 142.56">
- <defs>
-  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
- </defs>
- <g id="figure_1">
-  <g id="axes_1">
-   <g id="patch_1">
-    <path d="M 26.561094 98.388125 L 560.62 98.388125 L 560.62 27.757969 L 26.561094 27.757969 z" class="m-background"/>
-   </g>
-   <g id="plot3-value0-0"><title>111.9 kB</title>
-    <path clip-path="url(#pd6a36f6853)" d="M 26.561094 30.96843 L 94.068413 30.96843 L 94.068413 49.313926 L 26.561094 49.313926 z" class="m-bar m-success"/>
-   </g>
-   <g id="plot3-value0-1"><title>74.4 kB</title>
-    <path clip-path="url(#pd6a36f6853)" d="M 26.561094 53.900299 L 71.445317 53.900299 L 71.445317 72.245794 L 26.561094 72.245794 z" class="m-bar m-success"/>
-   </g>
-   <g id="plot3-value0-2"><title>52.1 kB</title>
-    <path clip-path="url(#pd6a36f6853)" d="M 26.561094 76.832168 L 57.992115 76.832168 L 57.992115 95.177663 L 26.561094 95.177663 z" class="m-bar m-success"/>
-   </g>
-   <g id="plot3-value1-0"><title>731.2 kB</title>
-    <path clip-path="url(#pd6a36f6853)" d="M 94.068413 30.96843 L 535.188624 30.96843 L 535.188624 49.313926 L 94.068413 49.313926 z" class="m-bar m-info"/>
-   </g>
-   <g id="plot3-value1-1"><title>226.3 kB</title>
-    <path clip-path="url(#pd6a36f6853)" d="M 71.445317 53.900299 L 207.968161 53.900299 L 207.968161 72.245794 L 71.445317 72.245794 z" class="m-bar m-info"/>
-   </g>
-   <g id="plot3-value1-2"><title>226.0 kB</title>
-    <path clip-path="url(#pd6a36f6853)" d="M 57.992115 76.832168 L 194.333975 76.832168 L 194.333975 95.177663 L 57.992115 95.177663 z" class="m-bar m-info"/>
-   </g>
-   <g id="matplotlib.axis_1">
-    <g id="xtick_1">
-     <g id="line2d_1">
-      <defs>
-       <path d="M 0 0 L 0 3.5" id="m230bf1d664" class="m-line"/>
-      </defs>
-      <g>
-       <use x="26.561094" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_1">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 26.561094, 113.746406)" x="26.561094" y="113.746406">0</text>
-     </g>
-    </g>
-    <g id="xtick_2">
-     <g id="line2d_2">
-      <g>
-       <use x="86.88935" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_2">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 86.88935, 113.746406)" x="86.88935" y="113.746406">100</text>
-     </g>
-    </g>
-    <g id="xtick_3">
-     <g id="line2d_3">
-      <g>
-       <use x="147.217607" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_3">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 147.217607, 113.746406)" x="147.217607" y="113.746406">200</text>
-     </g>
-    </g>
-    <g id="xtick_4">
-     <g id="line2d_4">
-      <g>
-       <use x="207.545863" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_4">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 207.545863, 113.746406)" x="207.545863" y="113.746406">300</text>
-     </g>
-    </g>
-    <g id="xtick_5">
-     <g id="line2d_5">
-      <g>
-       <use x="267.874119" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_5">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 267.874119, 113.746406)" x="267.874119" y="113.746406">400</text>
-     </g>
-    </g>
-    <g id="xtick_6">
-     <g id="line2d_6">
-      <g>
-       <use x="328.202376" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_6">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 328.202376, 113.746406)" x="328.202376" y="113.746406">500</text>
-     </g>
-    </g>
-    <g id="xtick_7">
-     <g id="line2d_7">
-      <g>
-       <use x="388.530632" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_7">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 388.530632, 113.746406)" x="388.530632" y="113.746406">600</text>
-     </g>
-    </g>
-    <g id="xtick_8">
-     <g id="line2d_8">
-      <g>
-       <use x="448.858889" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_8">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 448.858889, 113.746406)" x="448.858889" y="113.746406">700</text>
-     </g>
-    </g>
-    <g id="xtick_9">
-     <g id="line2d_9">
-      <g>
-       <use x="509.187145" xlink:href="#m230bf1d664" y="98.388125"/>
-      </g>
-     </g>
-     <g id="text_9">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 509.187145, 113.746406)" x="509.187145" y="113.746406">800</text>
-     </g>
-    </g>
-    <g id="text_10">
-     <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 293.590547, 128.392344)" x="293.590547" y="128.392344">kB</text>
-    </g>
-   </g>
-   <g id="matplotlib.axis_2">
-    <g id="ytick_1">
-     <g id="line2d_10">
-      <defs>
-       <path d="M 0 0 L -3.5 0" id="m1924854559" class="m-line"/>
-      </defs>
-      <g>
-       <use x="26.561094" xlink:href="#m1924854559" y="40.141178"/>
-      </g>
-     </g>
-     <g id="text_11">
-      <text class="m-label" style="text-anchor:end;" transform="rotate(-0, 19.561094, 44.320319)" x="19.561094" y="44.320319">A</text>
-     </g>
-    </g>
-    <g id="ytick_2">
-     <g id="line2d_11">
-      <g>
-       <use x="26.561094" xlink:href="#m1924854559" y="63.073047"/>
-      </g>
-     </g>
-     <g id="text_12">
-      <text class="m-label" style="text-anchor:end;" transform="rotate(-0, 19.561094, 67.252188)" x="19.561094" y="67.252188">B</text>
-     </g>
-    </g>
-    <g id="ytick_3">
-     <g id="line2d_12">
-      <g>
-       <use x="26.561094" xlink:href="#m1924854559" y="86.004916"/>
-      </g>
-     </g>
-     <g id="text_13">
-      <text class="m-label" style="text-anchor:end;" transform="rotate(-0, 19.561094, 90.184056)" x="19.561094" y="90.184056">C</text>
-     </g>
-    </g>
-   </g>
-   <g id="text_14">
-    <text class="m-title" style="text-anchor:middle;" transform="rotate(-0, 293.590547, 21.757969)" x="293.590547" y="21.757969">Stacked plot</text>
-   </g>
-  </g>
- </g>
- <defs>
-  <clipPath id="pd6a36f6853">
-   <rect height="70.630156" width="534.058906" x="26.561094" y="27.757969"/>
-  </clipPath>
- </defs>
-</svg>
-</div>
-<div class="m-plot">
-<svg viewBox="0 0 576 113.76">
- <defs>
-  <style type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
- </defs>
- <g id="figure_1">
-  <g id="axes_1">
-   <g id="patch_1">
-    <path d="M 26.427031 69.588125 L 560.62 69.588125 L 560.62 27.757969 L 26.427031 27.757969 z" class="m-background"/>
-   </g>
-   <g id="plot4-value0-0"><title>111.9 ± 25.0 kB</title>
-    <path clip-path="url(#pf9f5e4e753)" d="M 26.427031 29.659339 L 81.004452 29.659339 L 81.004452 46.560413 L 26.427031 46.560413 z" class="m-bar m-success"/>
-   </g>
-   <g id="plot4-value0-1"><title>74.4 ± 15.3 kB</title>
-    <path clip-path="url(#pf9f5e4e753)" d="M 26.427031 50.785681 L 62.714432 50.785681 L 62.714432 67.686754 L 26.427031 67.686754 z" class="m-bar m-danger"/>
-   </g>
-   <g id="plot4-value1-0"><title>731.2 ± 200.0 kB</title>
-    <path clip-path="url(#pf9f5e4e753)" d="M 81.004452 29.659339 L 437.635464 29.659339 L 437.635464 46.560413 L 81.004452 46.560413 z" class="m-bar m-info"/>
-   </g>
-   <g id="plot4-value1-1"><title>226.3 ± 5.0 kB</title>
-    <path clip-path="url(#pf9f5e4e753)" d="M 62.714432 50.785681 L 173.088608 50.785681 L 173.088608 67.686754 L 62.714432 67.686754 z" class="m-bar m-primary"/>
-   </g>
-   <g id="matplotlib.axis_1">
-    <g id="xtick_1">
-     <g id="line2d_1">
-      <defs>
-       <path d="M 0 0 L 0 3.5" id="med42be8496" class="m-line"/>
-      </defs>
-      <g>
-       <use x="26.427031" xlink:href="#med42be8496" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_1">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 26.427031, 84.946406)" x="26.427031" y="84.946406">0</text>
-     </g>
-    </g>
-    <g id="xtick_2">
-     <g id="line2d_2">
-      <g>
-       <use x="123.973807" xlink:href="#med42be8496" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_2">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 123.973807, 84.946406)" x="123.973807" y="84.946406">200</text>
-     </g>
-    </g>
-    <g id="xtick_3">
-     <g id="line2d_3">
-      <g>
-       <use x="221.520583" xlink:href="#med42be8496" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_3">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 221.520583, 84.946406)" x="221.520583" y="84.946406">400</text>
-     </g>
-    </g>
-    <g id="xtick_4">
-     <g id="line2d_4">
-      <g>
-       <use x="319.067358" xlink:href="#med42be8496" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_4">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 319.067358, 84.946406)" x="319.067358" y="84.946406">600</text>
-     </g>
-    </g>
-    <g id="xtick_5">
-     <g id="line2d_5">
-      <g>
-       <use x="416.614134" xlink:href="#med42be8496" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_5">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 416.614134, 84.946406)" x="416.614134" y="84.946406">800</text>
-     </g>
-    </g>
-    <g id="xtick_6">
-     <g id="line2d_6">
-      <g>
-       <use x="514.160909" xlink:href="#med42be8496" y="69.588125"/>
-      </g>
-     </g>
-     <g id="text_6">
-      <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 514.160909, 84.946406)" x="514.160909" y="84.946406">1000</text>
-     </g>
-    </g>
-    <g id="text_7">
-     <text class="m-label" style="text-anchor:middle;" transform="rotate(-0, 293.523516, 99.592344)" x="293.523516" y="99.592344">kB</text>
-    </g>
-   </g>
-   <g id="matplotlib.axis_2">
-    <g id="ytick_1">
-     <g id="line2d_7">
-      <defs>
-       <path d="M 0 0 L -3.5 0" id="m786f014bed" class="m-line"/>
-      </defs>
-      <g>
-       <use x="26.427031" xlink:href="#m786f014bed" y="38.109876"/>
-      </g>
-     </g>
-     <g id="text_8">
-      <text class="m-label" style="text-anchor:end;" transform="rotate(-0, 19.427031, 42.289017)" x="19.427031" y="42.289017">A</text>
-     </g>
-    </g>
-    <g id="ytick_2">
-     <g id="line2d_8">
-      <g>
-       <use x="26.427031" xlink:href="#m786f014bed" y="59.236218"/>
-      </g>
-     </g>
-     <g id="text_9">
-      <text class="m-label" style="text-anchor:end;" transform="rotate(-0, 19.427031, 63.415358)" x="19.427031" y="63.415358">B</text>
-     </g>
-    </g>
-   </g>
-   <g id="LineCollection_1">
-    <path clip-path="url(#pf9f5e4e753)" d="M 68.811105 38.109876 L 93.197799 38.109876" class="m-error"/>
-    <path clip-path="url(#pf9f5e4e753)" d="M 55.252103 59.236218 L 70.17676 59.236218" class="m-error"/>
-   </g>
-   <g id="LineCollection_2">
-    <path clip-path="url(#pf9f5e4e753)" d="M 340.088688 38.109876 L 535.18224 38.109876" class="m-error"/>
-    <path clip-path="url(#pf9f5e4e753)" d="M 170.649939 59.236218 L 175.527278 59.236218" class="m-error"/>
-   </g>
-   <g id="line2d_9">
-    <defs>
-     <path d="M 0 5 L 0 -5" id="m1e7a6d6b54" class="m-error"/>
-    </defs>
-    <g clip-path="url(#pf9f5e4e753)">
-     <use x="68.811105" xlink:href="#m1e7a6d6b54" y="38.109876"/>
-     <use x="55.252103" xlink:href="#m1e7a6d6b54" y="59.236218"/>
-    </g>
-   </g>
-   <g id="line2d_10">
-    <g clip-path="url(#pf9f5e4e753)">
-     <use x="93.197799" xlink:href="#m1e7a6d6b54" y="38.109876"/>
-     <use x="70.17676" xlink:href="#m1e7a6d6b54" y="59.236218"/>
-    </g>
-   </g>
-   <g id="line2d_11">
-    <g clip-path="url(#pf9f5e4e753)">
-     <use x="340.088688" xlink:href="#m1e7a6d6b54" y="38.109876"/>
-     <use x="170.649939" xlink:href="#m1e7a6d6b54" y="59.236218"/>
-    </g>
-   </g>
-   <g id="line2d_12">
-    <g clip-path="url(#pf9f5e4e753)">
-     <use x="535.18224" xlink:href="#m1e7a6d6b54" y="38.109876"/>
-     <use x="175.527278" xlink:href="#m1e7a6d6b54" y="59.236218"/>
-    </g>
-   </g>
-   <g id="text_10">
-    <text class="m-title" style="text-anchor:middle;" transform="rotate(-0, 293.523516, 21.757969)" x="293.523516" y="21.757969">Stacked plot with errors and full colors</text>
-   </g>
-  </g>
- </g>
- <defs>
-  <clipPath id="pf9f5e4e753">
-   <rect height="41.830156" width="534.192969" x="26.427031" y="27.757969"/>
-  </clipPath>
- </defs>
-</svg>
-</div>
-<!-- /content -->
-      </div>
-    </div>
-  </div>
-</article>
-</main>
-</body>
-</html>

diff --git a/plugins/m/test/test_plots.py b/plugins/m/test/test_plots.py
index 7c48e289a55e8bb81ecd2d9eafa482663bd9fb97..f93e95850037d954653826dc1580dc8b24a69851 100644 (file)
--- a/plugins/m/test/test_plots.py
+++ b/plugins/m/test/test_plots.py
@@ -45,9 +45,6 @@ class Plots(PelicanPluginTestCase):
         if LooseVersion(matplotlib.__version__) >= LooseVersion('3.2'):
             self.assertEqual(*self.actual_expected_contents('page.html'))
         elif LooseVersion(matplotlib.__version__) >= LooseVersion('3.0'):
-            if LooseVersion(sys.version) >= LooseVersion("3.6"):
-                self.assertEqual(*self.actual_expected_contents('page-30.html'))
-            else:
-                self.assertEqual(*self.actual_expected_contents('page.html', 'page-py35.html'))
+            self.assertEqual(*self.actual_expected_contents('page-30.html'))
         else:
             self.assertEqual(*self.actual_expected_contents('page.html', 'page-22.html'))