From: Vladimír Vondruš Date: Mon, 26 Nov 2018 14:24:49 +0000 (+0100) Subject: m.plots: Travis with 16.04 doesn't have this bug anymore, it seems. X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=7a35c3899e6ebe3289c0f1fb274e58d0ed7dffaf;p=blog.git m.plots: Travis with 16.04 doesn't have this bug anymore, it seems. --- diff --git a/package/ci/travis.yml b/package/ci/travis.yml index f2ad94b8..fe24cfea 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -10,7 +10,6 @@ matrix: - WITH_THEME=ON - WITH_DOXYGEN=OFF - WITH_NODE=OFF - - TRAVIS_BROKEN_MATPLOTLIB_SEED=YES - JOBID=py34 - language: python python: 3.5 diff --git a/pelican-plugins/m/test/plots/page-travis-broken-matplotlib-seed.html b/pelican-plugins/m/test/plots/page-travis-broken-matplotlib-seed.html deleted file mode 100644 index 62592f13..00000000 --- a/pelican-plugins/m/test/plots/page-travis-broken-matplotlib-seed.html +++ /dev/null @@ -1,348 +0,0 @@ - - - - - m.plots | A Pelican Blog - - - - - - -

m.plots

- -

Note: the test uses DejaVu Sans instead of Source Sans Pro in order to have -predictable rendering on the CIs.

- -

- - diff --git a/pelican-plugins/m/test/test_plots.py b/pelican-plugins/m/test/test_plots.py index 40f40d97..cedbbb70 100644 --- a/pelican-plugins/m/test/test_plots.py +++ b/pelican-plugins/m/test/test_plots.py @@ -31,8 +31,6 @@ class Plots(PluginTestCase): def __init__(self, *args, **kwargs): super().__init__(__file__, '', *args, **kwargs) - @unittest.skipIf(os.environ.get('TRAVIS_BROKEN_MATPLOTLIB_SEED'), - "Travis Python 3.4 and 3.6 has broken matplotlib seed, causing different clip-path ID") def test(self): self.run_pelican({ 'PLUGINS': ['m.htmlsanity', 'm.plots'], @@ -40,13 +38,3 @@ class Plots(PluginTestCase): }) self.assertEqual(*self.actual_expected_contents('page.html')) - - @unittest.skipUnless(os.environ.get('TRAVIS_BROKEN_MATPLOTLIB_SEED'), - "Travis Python 3.4 and 3.6 has different matplotlib seed, causing different clip-path ID") - def test_broken_seed(self): - self.run_pelican({ - 'PLUGINS': ['m.htmlsanity', 'm.plots'], - 'M_PLOTS_FONT': 'DejaVu Sans' - }) - - self.assertEqual(*self.actual_expected_contents('page.html', 'page-travis-broken-matplotlib-seed.html'))