[Git][reproducible-builds/diffoscope][master] 3 commits: Don't attempt to attach text-only differences notice if there are no...

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
ed02b391 by Chris Lamb at 2022-11-18T09:25:59+00:00
Don't attempt to attach text-only differences notice if there are no differences to begin with. (Closes: Debian:#1024171, Debian:#1024349)

- - - - -
05d4597e by Chris Lamb at 2022-11-18T09:36:33+00:00
Don't run Python decompiling tests on Python bytecode that both file(1) cannot yet detect and Python 3.11 cannot demarshall. (Closes: Debian:#1024335)

- - - - -
3e6a2195 by Chris Lamb at 2022-11-18T09:38:37+00:00
releasing package diffoscope version 227

- - - - -


4 changed files:

- debian/changelog
- diffoscope/__init__.py
- diffoscope/comparators/html.py
- tests/comparators/test_python.py


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
-diffoscope (227) UNRELEASED; urgency=medium
+diffoscope (227) unstable; urgency=medium
 
-  * WIP (generated upon release).
+  [ Chris Lamb ]
+  * Don't attempt to attach text-only differences notice if there are no
+    differences to begin with. (Closes: #1024171, #1024349)
+  * Don't run Python decompiling tests on Python bytecode that both file(1)
+    cannot yet detect and Python 3.11 cannot demarshall. (Closes: #1024335)
 
- -- Chris Lamb <lamby at debian.org>  Fri, 04 Nov 2022 06:59:43 +0000
+ -- Chris Lamb <lamby at debian.org>  Fri, 18 Nov 2022 09:38:34 +0000
 
 diffoscope (226) 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 = "226"
+VERSION = "227"


=====================================
diffoscope/comparators/html.py
=====================================
@@ -39,6 +39,9 @@ class HtmlFile(TextFile):
     def compare(self, other, source=None):
         difference = super().compare(other, source)
 
+        if difference is None:
+            return difference
+
         # Show text-only differences as a sub-diff.
         try:
             text = Difference.from_operation(Htmltotext, self.path, other.path)


=====================================
tests/comparators/test_python.py
=====================================
@@ -53,8 +53,8 @@ def differences(pyc1, pyc2):
 
 @skip_unless_file_version_is_at_least("5.39")
 @skipif(
-    sys.version_info < (3, 8),
-    reason="Python 3.7 cannot de-marshal test1.pyc-renamed",
+    sys.version_info[:2] not in {(3, 9), (3, 10)},
+    reason="Only Python 3.9 and 3.10 can de-marshal test1.pyc-renamed",
 )
 def test_diff(differences):
     assert_diff_startswith(



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/eff9c87b2cc416858ccc03afd698eafdf6d01a37...3e6a219582709c24fe6b260828b561c2c3d04344

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/eff9c87b2cc416858ccc03afd698eafdf6d01a37...3e6a219582709c24fe6b260828b561c2c3d04344
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/20221118/271066b4/attachment.htm>