From 7128d891ca9a78c242b553874f54542765f6e553c8e3fcd3659ca77b3b3e31db Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sun, 14 Nov 2021 21:14:52 +0000 Subject: [PATCH 1/2] - update to version 192: - Update .epub test methodology after improving XML file parsing. - update to version 191: - Detect XML files as XML files if either file(1) claims if they are XML files, or if they are named .xml. (Closes: #999438, reproducible-builds/diffoscope#287) - Don't reject Debian .changes files if they contain non-printable characters. (Closes: reproducible-builds/diffoscope#286) - Continue loading a .changes file even if the referenced files inside it do not exist, but include a comment in the diff as a result. - Log the reason if we cannot load a Debian .changes file. - Fix inverted logic in the assert_diff_startswith() utility. - update to version 190: - Don't raise a traceback if we cannot de-marshal Python bytecode to support Python 3.7 loading newer .pyc files. (Closes: reproducible-builds/diffoscope#284) - Fix Python tests under Python 3.7 with file 5.39+. - Skip Python bytecode testing when "file" is older than 5.39. - Detect whether the GNU_BUILD_ID field has been modified. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diffoscope?expand=0&rev=40 --- diffoscope-189.tar.bz2 | 3 --- diffoscope-189.tar.bz2.asc | 16 ---------------- diffoscope-192.tar.bz2 | 3 +++ diffoscope-192.tar.bz2.asc | 16 ++++++++++++++++ diffoscope.changes | 23 +++++++++++++++++++++++ diffoscope.spec | 2 +- 6 files changed, 43 insertions(+), 20 deletions(-) delete mode 100644 diffoscope-189.tar.bz2 delete mode 100644 diffoscope-189.tar.bz2.asc create mode 100644 diffoscope-192.tar.bz2 create mode 100644 diffoscope-192.tar.bz2.asc diff --git a/diffoscope-189.tar.bz2 b/diffoscope-189.tar.bz2 deleted file mode 100644 index ced0550..0000000 --- a/diffoscope-189.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce5ab145521e826aff7d5d08f611bf08c367d1d729618a8358a1e536be6f750c -size 2686812 diff --git a/diffoscope-189.tar.bz2.asc b/diffoscope-189.tar.bz2.asc deleted file mode 100644 index fddf557..0000000 --- a/diffoscope-189.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmF7tSQACgkQHpU+J9Qx -HlixERAAoIXR4LghFChjspFPxs1ndSe7Z7RkP6dNvvYhuW2HotFPdX0r5BY0wnnp -mm5fwGIU+O/BOs85uP1ycgFx6DnS7JwgvP83mlRNqvNYRV7Mz+BRzfxIkJF6WAnW -83eRD1gxRs5LjG1VaEtFQf6NsxrNEW1AfwHeaBMBtZvHCmDlAihjFMrxUhy3OlyE -lfy7+Fj9u6v7gKiH5+749GMEO9Omv+I0K+X6vQ1WK+RyZEbv7uOZ8xCNjRpCKyuJ -MPIFlpwEPlu5fMdNuXaYuFI0kniFQDU22raxclU3MWrxc4JGHncuGHBsVO3GYhRF -cOm+KuaTNkv4PSXoO1XqlON5H/ZSls8Y6goX+xF9Qy7ZiQV38LkfC0vLtxM2F6JD -qbVUZ1MkBH5id/qVCZZPiz6bAhc+mOE1pVROkPBdpJo0jaQ7hD++Zv/PtUewu6Gy -IZnkipNrPJ1DWB+BVslRbtf1aGB1IOHZPDAzS0ikkDS9U9XSnnm/tGgIyqAJ43ow -zFfbWwQJJ9SkD5Un6DSrh/x+MuyUZViNInODK6NwKi67fEMzY/tyTffLOMQjkylN -WY5csWfGFpXGkBa+hvPSg6P9VLyAsGwNEoN+0LYVZdkjcXxiN3RBTQ4SJjQ05dOn -80RXVejK1UqDqzstJzDjKzuzD5keO6Z5arPUPzw3E3GZOsq+OQc= -=htzH ------END PGP SIGNATURE----- diff --git a/diffoscope-192.tar.bz2 b/diffoscope-192.tar.bz2 new file mode 100644 index 0000000..5111518 --- /dev/null +++ b/diffoscope-192.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65a484d726339d921057bc8ac9e065a90ce48149f70a869d658d9f0c0d7f4a71 +size 2687814 diff --git a/diffoscope-192.tar.bz2.asc b/diffoscope-192.tar.bz2.asc new file mode 100644 index 0000000..099df1e --- /dev/null +++ b/diffoscope-192.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmGOk5EACgkQHpU+J9Qx +Hljk+g//UgwrPQ4Iw4CinFrDea+2+Xa7nPY9XSVAM2IyyZjJ2zKQaPx4707z1npa +W3VbvchLLlQB1b1F4wlIcCYshPmGRr1sn58DpfkiX15bEy1iHvIKyqCr4ul0GnXm +0rvJT0r6Ehmp7hXNrMCbFe0fRU++HTNN8edFzphXXsB1FnWG1fU8Z+jfTV2WnCxj +QGA+1r4DVIEIKSgd+S15nOsv7wQd/Hg1xSmOcY8DbMXlQQ6qEqsphafMQrktQOlQ +GPW8bu/SJEsfxQGYl2fBSp+oNlbSJv04n0gYHyDx0lWav7Yu+j2MGdR0soTb/MmN +ELGaXHNAOeeej4xWHLhQGbhLQnP1eQdacN+tMahPpcn8LfwxHxoAvfQprI4b611s +S9NlYRSJ6ihkb1WIkp+hxtdBiATO503jZA/DkyICVDFs33NChEKx3HL292kC17Tc +FkXeoBelrvEcbyGRd4BUBj/xijBOlHAuipGjO27JkFyAJ4RyrGwaGXsjhGhoyG17 +QTJ8M/te6kHd5NLiAbYI0IdEoGFPKPr2C71jG2SG3Jh2G4lp1RmBOkMX8GuaCXi7 +89sOldsnU729MEkmttSKdIh9UvEQNzyjpRe7qd6xTSq45SM1qFSkoEkkAJQARXjs +HOmvDdVvyw1qgLeEuZWZ3n8VwOX8Iu645fD23ndXWQa+WBdofLQ= +=OUsp +-----END PGP SIGNATURE----- diff --git a/diffoscope.changes b/diffoscope.changes index a0d8d59..3cba5de 100644 --- a/diffoscope.changes +++ b/diffoscope.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun Nov 14 21:14:04 UTC 2021 - Sebastian Wagner + +- update to version 192: + - Update .epub test methodology after improving XML file parsing. +- update to version 191: + - Detect XML files as XML files if either file(1) claims if they are XML + files, or if they are named .xml. + (Closes: #999438, reproducible-builds/diffoscope#287) + - Don't reject Debian .changes files if they contain non-printable + characters. (Closes: reproducible-builds/diffoscope#286) + - Continue loading a .changes file even if the referenced files inside it do + not exist, but include a comment in the diff as a result. + - Log the reason if we cannot load a Debian .changes file. + - Fix inverted logic in the assert_diff_startswith() utility. +- update to version 190: + - Don't raise a traceback if we cannot de-marshal Python bytecode to support + Python 3.7 loading newer .pyc files. + (Closes: reproducible-builds/diffoscope#284) + - Fix Python tests under Python 3.7 with file 5.39+. + - Skip Python bytecode testing when "file" is older than 5.39. + - Detect whether the GNU_BUILD_ID field has been modified. + ------------------------------------------------------------------- Tue Nov 2 19:29:18 UTC 2021 - Sebastian Wagner diff --git a/diffoscope.spec b/diffoscope.spec index 2bac047..e7dc8a6 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -17,7 +17,7 @@ Name: diffoscope -Version: 189 +Version: 192 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later From 58a6fc84d6b97ac665b706afb3a74c3aaa6560105792ecf623a3291dec2a6543 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sat, 20 Nov 2021 15:11:19 +0000 Subject: [PATCH 2/2] - - update to version 193: - Don't duplicate file lists at each directory level. (Closes: #989192, reproducible-builds/diffoscope#263) - When pretty-printing JSON, mark the difference as such, additionally avoiding including the full path. (Closes: reproducible-builds/diffoscope#205) - Codebase improvements: - Update a bunch of %-style string interpolations into f-strings or str.format. - Import itertools top-level directly. - Drop some unused imports. - Use isinstance(...) over type(...) == - Avoid aliasing variables if we aren't going to use them. - Fix missing diff output on large diffs. - Ignore a Python warning coming from a dependent library (triggered by supporting Python 3.10) - Document that support both Python 3.9 and 3.10. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diffoscope?expand=0&rev=41 --- diffoscope-192.tar.bz2 | 3 --- diffoscope-192.tar.bz2.asc | 16 ---------------- diffoscope-193.tar.bz2 | 3 +++ diffoscope-193.tar.bz2.asc | 16 ++++++++++++++++ diffoscope.changes | 21 +++++++++++++++++++++ diffoscope.spec | 2 +- 6 files changed, 41 insertions(+), 20 deletions(-) delete mode 100644 diffoscope-192.tar.bz2 delete mode 100644 diffoscope-192.tar.bz2.asc create mode 100644 diffoscope-193.tar.bz2 create mode 100644 diffoscope-193.tar.bz2.asc diff --git a/diffoscope-192.tar.bz2 b/diffoscope-192.tar.bz2 deleted file mode 100644 index 5111518..0000000 --- a/diffoscope-192.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65a484d726339d921057bc8ac9e065a90ce48149f70a869d658d9f0c0d7f4a71 -size 2687814 diff --git a/diffoscope-192.tar.bz2.asc b/diffoscope-192.tar.bz2.asc deleted file mode 100644 index 099df1e..0000000 --- a/diffoscope-192.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmGOk5EACgkQHpU+J9Qx -Hljk+g//UgwrPQ4Iw4CinFrDea+2+Xa7nPY9XSVAM2IyyZjJ2zKQaPx4707z1npa -W3VbvchLLlQB1b1F4wlIcCYshPmGRr1sn58DpfkiX15bEy1iHvIKyqCr4ul0GnXm -0rvJT0r6Ehmp7hXNrMCbFe0fRU++HTNN8edFzphXXsB1FnWG1fU8Z+jfTV2WnCxj -QGA+1r4DVIEIKSgd+S15nOsv7wQd/Hg1xSmOcY8DbMXlQQ6qEqsphafMQrktQOlQ -GPW8bu/SJEsfxQGYl2fBSp+oNlbSJv04n0gYHyDx0lWav7Yu+j2MGdR0soTb/MmN -ELGaXHNAOeeej4xWHLhQGbhLQnP1eQdacN+tMahPpcn8LfwxHxoAvfQprI4b611s -S9NlYRSJ6ihkb1WIkp+hxtdBiATO503jZA/DkyICVDFs33NChEKx3HL292kC17Tc -FkXeoBelrvEcbyGRd4BUBj/xijBOlHAuipGjO27JkFyAJ4RyrGwaGXsjhGhoyG17 -QTJ8M/te6kHd5NLiAbYI0IdEoGFPKPr2C71jG2SG3Jh2G4lp1RmBOkMX8GuaCXi7 -89sOldsnU729MEkmttSKdIh9UvEQNzyjpRe7qd6xTSq45SM1qFSkoEkkAJQARXjs -HOmvDdVvyw1qgLeEuZWZ3n8VwOX8Iu645fD23ndXWQa+WBdofLQ= -=OUsp ------END PGP SIGNATURE----- diff --git a/diffoscope-193.tar.bz2 b/diffoscope-193.tar.bz2 new file mode 100644 index 0000000..323613b --- /dev/null +++ b/diffoscope-193.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb8619ce92ecfef7e164b616dafd4662af1c605abd925c238d6405139ad36e0d +size 2688422 diff --git a/diffoscope-193.tar.bz2.asc b/diffoscope-193.tar.bz2.asc new file mode 100644 index 0000000..1582fa0 --- /dev/null +++ b/diffoscope-193.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmGXywsACgkQHpU+J9Qx +HlhmOA/+KTd4hDPwha12q7Dp5guU75s407cBZjZmhjIEV8g6ybYJtm31BVGsY78n +ZfF1Iob4TyBv8vxRaQr63VYkHHRwce7SWR4KWi+Z6ErH3OZJX2wTk0v6Ejh11RyQ +L2Z7sWFhbPPKMzivNyIUXqoOd4+3fmYNyO/6Bu4079YedgSJgdgeUdDjSkefl5TY +oVQQJnlCfUkOwUli6GIPkKEmv5NqdjzKeSirFiP1V2j/KdtLI16dsFH0KowB+5U6 +89sXde8m36kbEUHxd1HgHXH1SLWY4CQoSo9FHcJBerpHD2YHoI+ngIuoDRXwGkKn +9QVd8nEMoc3Kl5lrtPojcod2K4u/SQXYvTcDO2ADRTvkLEfVtiWJyGxK00LaqSaH +h6UUUrb+W9gwUX/kX93mKxBuypuUSHHc7Fk49cFYUOcErTCduPaAe1PgS5uMafQB +VIQWxTtZlTzNYpyEJfNteLRK1nuGiIqil/5GODwyntzmyrepD/SnGa0o8eHp0mRv +sQxiGIhzLP+dCk4m/NMCksGim2QRAfgyKTaxVXSHtQlqWZ9aeD0xDIyGTIQPW2+F +fiyMEokfTCs9g6E6w/bz3JBYGn306HEu9n0cb1RdecQtKebI5ezUZ3QGn/Wtxtak +06/C6JpCPEJ5Y/MCV+NsXwzYAkJfexCJRjH5lRh8sHC8dsaYRNM= +=HLI/ +-----END PGP SIGNATURE----- diff --git a/diffoscope.changes b/diffoscope.changes index 3cba5de..9f2190a 100644 --- a/diffoscope.changes +++ b/diffoscope.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Sat Nov 20 13:01:25 UTC 2021 - Sebastian Wagner + +- - update to version 193: + - Don't duplicate file lists at each directory level. + (Closes: #989192, reproducible-builds/diffoscope#263) + - When pretty-printing JSON, mark the difference as such, additionally + avoiding including the full path. + (Closes: reproducible-builds/diffoscope#205) + - Codebase improvements: + - Update a bunch of %-style string interpolations into f-strings or + str.format. + - Import itertools top-level directly. + - Drop some unused imports. + - Use isinstance(...) over type(...) == + - Avoid aliasing variables if we aren't going to use them. + - Fix missing diff output on large diffs. + - Ignore a Python warning coming from a dependent library (triggered by + supporting Python 3.10) + - Document that support both Python 3.9 and 3.10. + ------------------------------------------------------------------- Sun Nov 14 21:14:04 UTC 2021 - Sebastian Wagner diff --git a/diffoscope.spec b/diffoscope.spec index e7dc8a6..5a70ff8 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -17,7 +17,7 @@ Name: diffoscope -Version: 192 +Version: 193 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later