[Git][reproducible-builds/diffoscope][master] 6 commits: Do not ignore testing in gitlab-ci.

Wed Jul 31 07:10:17 UTC 2024


Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
bc2229c7 by Mattia Rizzolo at 2024-07-31T14:41:35+09:00
Do not ignore testing in gitlab-ci.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
39d47cbc by Mattia Rizzolo at 2024-07-31T15:26:35+09:00
deb/control: Bump Standards-Version to 4.7.0, no changes needed

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
40b63b71 by Mattia Rizzolo at 2024-07-31T15:35:01+09:00
deb/source: adjust options to make sure not to pack the python s-dist directory into the debian package

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
633654ee by Mattia Rizzolo at 2024-07-31T15:35:08+09:00
Adjust lintian overrides

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
7eb2036a by Mattia Rizzolo at 2024-07-31T15:35:10+09:00
Release 273

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
17bf6437 by Mattia Rizzolo at 2024-07-31T16:07:51+09:00
Open new changelog entry for version 274.

Gbp-Dch: Ignore
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


7 changed files:

- .gitlab-ci.yml
- debian/changelog
- debian/control
- + debian/diffoscope-minimal.lintian-overrides
- debian/source/lintian-overrides
- debian/source/options
- diffoscope/__init__.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -26,7 +26,14 @@ unstable:
 testing:
   <<: *test
   image: debian:testing
-  allow_failure: true
+# Whenever this "testing" test fails, we risk receiving #1070416
+# so please let's not ignore these failures.
+# Solutions range from temporarily remove the build-dependencies (also adjust
+# autopkgtest dependencies and expectations in the `pytst` test), to fixing the
+# problematic dependencies.
+# See c6bba336606ca6f44036b65e479521a126f080dc for an example on how to disable
+# a dependency.
+  allow_failure: false
 
 stable-bpo:
   <<: *test


=====================================
debian/changelog
=====================================
@@ -1,8 +1,34 @@
-diffoscope (273) UNRELEASED; urgency=medium
+diffoscope (274) UNRELEASED; urgency=medium
 
   * WIP (generated upon release).
 
- -- Chris Lamb <lamby at debian.org>  Fri, 05 Jul 2024 07:17:15 -0700
+ -- Mattia Rizzolo <mattia at debian.org>  Wed, 31 Jul 2024 16:07:27 +0900
+
+diffoscope (273) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Factor out version detection in test_jpeg_image. (Re:
+    reproducible-builds/diffoscope#384)
+  * Ensure that 'convert' is from Imagemagick 6.x; we will need to update a
+    few things with IM7. (Closes: reproducible-builds/diffoscope#384)
+  * Correct import of identify_version after refactoring change in 037bdcbb0.
+
+  [ Mattia Rizzolo ]
+  * tests:
+    + Add OpenSSH key test with a ed25519 key.
+    + Skip the OpenSSH test with DSA key if openssh is >> 9.7
+    + Support ffmpeg >= 7 that adds some extra context to the diff
+  * Do not ignore testing in gitlab-ci.
+  * debian:
+    + Temporarily remove aapt, androguard and dexdump from the build/test
+      dependencies as they are not available in testin/trixie.  Closes: #1070416
+    + Bump Standards-Version to 4.7.0, no changes needed.
+    + Adjust options to make sure not to pack the python s-dist directory
+      into the debian source package.
+    + Adjust the lintian overrides.
+
+
+ -- Mattia Rizzolo <mattia at debian.org>  Wed, 31 Jul 2024 15:31:22 +0900
 
 diffoscope (272) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -98,7 +98,7 @@ Build-Depends:
  zstd <!nocheck>,
 Build-Conflicts:
  graphicsmagick-imagemagick-compat,
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Rules-Requires-Root: no
 Homepage: https://diffoscope.org
 Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git


=====================================
debian/diffoscope-minimal.lintian-overrides
=====================================
@@ -0,0 +1 @@
+executable-in-usr-lib [usr/lib/python3/dist-packages/diffoscope/scripts/extract-vmlinux]


=====================================
debian/source/lintian-overrides
=====================================
@@ -19,6 +19,8 @@ source-is-missing [tests/data/test1.o]
 source-is-missing [tests/data/test2.o]
 source-is-missing [tests/data/test1.debug]
 source-is-missing [tests/data/test2.debug]
+source-contains-prebuilt-binary [tests/data/test1.o]
+source-contains-prebuilt-binary [tests/data/test2.o]
 source-contains-prebuilt-binary [tests/data/test1.debug]
 source-contains-prebuilt-binary [tests/data/test2.debug]
 source-contains-prebuilt-windows-binary [tests/data/test1.exe]
@@ -31,6 +33,9 @@ source-contains-prebuilt-wasm-binary [tests/data/hello2.wasm]
 #source-is-missing [tests/data/test1.pyc-renamed]
 #source-is-missing [tests/data/test2.pyc-renamed]
 
+# another test artefact
+source-is-missing [tests/data/output_expected_363.html]
+
 # override warning we can fix nicely with python-debian from bookworm or later.
 # (= so once we don't maintain diffoscope in bullseye-backports anymore)
 # we can fix this in debian/tests/control.sh by running


=====================================
debian/source/options
=====================================
@@ -9,3 +9,5 @@
 --tar-ignore=.gitattributes
 --tar-ignore=.gitignore
 --tar-ignore=.gitmodules
+--tar-ignore=.git-blame-ignore-revs
+--tar-ignore=dist


=====================================
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 = "272"
+VERSION = "273"



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/c6bba336606ca6f44036b65e479521a126f080dc...17bf6437c80d7aa500f823b7ff45ff936b4123cc

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/c6bba336606ca6f44036b65e479521a126f080dc...17bf6437c80d7aa500f823b7ff45ff936b4123cc
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/20240731/bf54b218/attachment.htm>
