[Git][reproducible-builds/diffoscope][master] 3 commits: Drop other copyright notices from lzip.py and test_lzip.py.

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
4a6f0811 by Chris Lamb at 2022-11-04T06:48:43+00:00
Drop other copyright notices from lzip.py and test_lzip.py.

- - - - -
6d3a2779 by Chris Lamb at 2022-11-04T06:50:04+00:00
Use assert_diff helper in test_lzip.py.

- - - - -
30c83fcb by Chris Lamb at 2022-11-04T06:51:46+00:00
releasing package diffoscope version 226

- - - - -


4 changed files:

- debian/changelog
- diffoscope/__init__.py
- diffoscope/comparators/lzip.py
- tests/comparators/test_lzip.py


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,21 @@
-diffoscope (226) UNRELEASED; urgency=medium
+diffoscope (226) unstable; urgency=medium
 
-  * WIP (generated upon release).
+  [ Christopher Baines ]
+  * Add an lzip comparator with tests.
 
- -- Chris Lamb <lamby at debian.org>  Fri, 28 Oct 2022 08:35:48 -0700
+  [ Chris Lamb ]
+  * Add support for comparing the "text" content of HTML files using html2text.
+    (Closes: #1022209, reproducible-builds/diffoscope#318)
+  * Misc/test improvements:
+    * Drop the ALLOWED_TEST_FILES test; it's mostly just annoying.
+    * Drop other copyright notices from lzip.py and test_lzip.py.
+    * Use assert_diff helper in test_lzip.py.
+    * Pylint tests/test_source.py.
+
+  [ Mattia Rizzolo ]
+  * Add lzip to debian dependencies.
+
+ -- Chris Lamb <lamby at debian.org>  Fri, 04 Nov 2022 06:51:43 +0000
 
 diffoscope (225) 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 = "225"
+VERSION = "226"


=====================================
diffoscope/comparators/lzip.py
=====================================
@@ -1,8 +1,6 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2014-2015 Jérémy Bobbio <lunar at debian.org>
-# Copyright © 2015-2020 Chris Lamb <lamby at debian.org>
 # Copyright © 2022 Christopher Baines <mail at cbaines.net>
 #
 # diffoscope is free software: you can redistribute it and/or modify


=====================================
tests/comparators/test_lzip.py
=====================================
@@ -1,8 +1,6 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2015 Jérémy Bobbio <lunar at debian.org>
-# Copyright © 2016-2017, 2020 Chris Lamb <lamby at debian.org>
 # Copyright © 2022 Christopher Baines <mail at cbaines.net>
 #
 # diffoscope is free software: you can redistribute it and/or modify
@@ -25,7 +23,7 @@ from diffoscope.comparators.lzip import LzipFile
 from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.utils.specialize import specialize
 
-from ..utils.data import load_fixture, get_data
+from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist
 from ..utils.nonexisting import assert_non_existing
 
@@ -68,8 +66,7 @@ def test_content_source_without_extension(tmpdir, lzip1, lzip2):
 
 @skip_unless_tools_exist("lzip")
 def test_content_diff(differences):
-    expected_diff = get_data("text_ascii_expected_diff")
-    assert differences[0].unified_diff == expected_diff
+    assert_diff(differences[0], "text_ascii_expected_diff")
 
 
 @skip_unless_tools_exist("lzip")



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e4178cdf8fea753470a40c3491649cae14165a4d...30c83fcb2c0085115dddb729cea3dc13b7748028

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e4178cdf8fea753470a40c3491649cae14165a4d...30c83fcb2c0085115dddb729cea3dc13b7748028
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/20221104/38b31f06/attachment.htm>