[Git][reproducible-builds/diffoscope][master] 2 commits: Skip test_html.py::test_diff if html2text is not installed. (Closes: Debian:#1026034)

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
49859283 by Chris Lamb at 2022-12-20T23:11:11+00:00
Skip test_html.py::test_diff if html2text is not installed. (Closes: Debian:#1026034)

- - - - -
2017884f by Chris Lamb at 2022-12-20T23:12:19+00:00
releasing package diffoscope version 229

- - - - -


3 changed files:

- debian/changelog
- diffoscope/__init__.py
- tests/comparators/test_html.py


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,13 @@
-diffoscope (229) UNRELEASED; urgency=medium
+diffoscope (229) unstable; urgency=medium
 
-  * WIP (generated upon release).
+  [ Chris Lamb ]
+  * Skip test_html.py::test_diff if html2text is not installed.
+    (Closes: #1026034)
+
+  [ Holger Levsen ]
+  * Bump standards version to 4.6.2, no changes needed.
 
- -- Chris Lamb <lamby at debian.org>  Fri, 02 Dec 2022 08:16:30 +0000
+ -- Chris Lamb <lamby at debian.org>  Tue, 20 Dec 2022 23:12:16 +0000
 
 diffoscope (228) unstable; urgency=medium
 


=====================================
diffoscope/__init__.py
=====================================
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "228"
+VERSION = "229"


=====================================
tests/comparators/test_html.py
=====================================
@@ -21,6 +21,7 @@ import pytest
 from diffoscope.comparators.html import HtmlFile
 
 from ..utils.data import assert_diff, load_fixture
+from ..utils.tools import skip_unless_tools_exist
 
 
 html1 = load_fixture("test1.html")
@@ -41,6 +42,7 @@ def differences(html1, html2):
     return html1.compare(html2)
 
 
+ at skip_unless_tools_exist("html2text")
 def test_diff(differences):
     assert_diff(differences, "html_expected_diff")
     assert_diff(differences.details[0], "html_text_expected_diff")



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e980ce7c9004a8efe2d8168cef41bd709170f402...2017884f59ae0f962da0c4b511fe8f5806ad5e8f

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e980ce7c9004a8efe2d8168cef41bd709170f402...2017884f59ae0f962da0c4b511fe8f5806ad5e8f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20221220/38cfcb42/attachment.htm>