From 76c46d81548d108cea3b2c481f4eb3c547ef956a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 2 Jan 2022 20:16:50 +0100 Subject: [PATCH] m.dot, documentation/*: use graphviz 2.44 output for 2.42.2 also. Hope this finally makes the CI pass. --- documentation/test_doxygen/test_contents.py | 6 ++++-- documentation/test_python/test_page.py | 4 ++-- plugins/m/test/test_dot.py | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/documentation/test_doxygen/test_contents.py b/documentation/test_doxygen/test_contents.py index df658017..2ead912b 100644 --- a/documentation/test_doxygen/test_contents.py +++ b/documentation/test_doxygen/test_contents.py @@ -255,7 +255,8 @@ class Custom(IntegrationTestCase): def test_dot(self): self.run_doxygen(wildcard='dot.xml') - if LooseVersion(dot_version()) >= LooseVersion("2.44.0"): + # Used to be >= 2.44.0, but 2.42.2 appears to have the same output + if LooseVersion(dot_version()) >= LooseVersion("2.42.2"): file = 'dot.html' elif LooseVersion(dot_version()) > LooseVersion("2.40.0"): file = 'dot-240.html' @@ -338,7 +339,8 @@ class Dot(IntegrationTestCase): def test(self): self.run_doxygen(wildcard='indexpage.xml') - if LooseVersion(dot_version()) >= LooseVersion("2.44.0"): + # Used to be >= 2.44.0, but 2.42.2 appears to have the same output + if LooseVersion(dot_version()) >= LooseVersion("2.42.2"): file = 'index.html' elif LooseVersion(dot_version()) > LooseVersion("2.40.0"): file = 'index-240.html' diff --git a/documentation/test_python/test_page.py b/documentation/test_python/test_page.py index 0d412dbb..42e432de 100644 --- a/documentation/test_python/test_page.py +++ b/documentation/test_python/test_page.py @@ -82,8 +82,8 @@ class Plugins(BaseTestCase): }) self.assertEqual(*self.actual_expected_contents('index.html')) - # The output is different for every other Graphviz - if LooseVersion(dot_version()) >= LooseVersion("2.44.0"): + # Used to be >= 2.44.0, but 2.42.2 appears to have the same output + if LooseVersion(dot_version()) >= LooseVersion("2.42.2"): file = 'dot.html' elif LooseVersion(dot_version()) > LooseVersion("2.40.0"): file = 'dot-240.html' diff --git a/plugins/m/test/test_dot.py b/plugins/m/test/test_dot.py index fd366706..0d227c16 100644 --- a/plugins/m/test/test_dot.py +++ b/plugins/m/test/test_dot.py @@ -43,7 +43,8 @@ class Dot(PelicanPluginTestCase): 'M_DOT_FONT': 'DejaVu Sans' }) - if LooseVersion(dot_version()) >= LooseVersion("2.44.0"): + # Used to be >= 2.44.0, but 2.42.2 appears to have the same output + if LooseVersion(dot_version()) >= LooseVersion("2.42.2"): file = 'page.html' elif LooseVersion(dot_version()) > LooseVersion("2.40.0"): file = 'page-240.html' -- 2.30.2