[Git][reproducible-builds/diffoscope][master] sort the list of recommended python modules in d/t/control

Mattia Rizzolo gitlab at salsa.debian.org
Sun Nov 11 12:36:20 CET 2018


Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
b618777c by Mattia Rizzolo at 2018-11-11T11:35:28Z
sort the list of recommended python modules in d/t/control

something (distutils?) uses a different order in stretch

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

- - - - -


2 changed files:

- debian/rules
- debian/tests/control


Changes:

=====================================
debian/rules
=====================================
@@ -73,7 +73,7 @@ override_dh_auto_clean:
 	@sed -i "s#%RECOMMENDS%#$(shell bin/diffoscope --list-debian-substvars | cut -d= -f2)#" debian/tests/control.tmp
 	@sed -i "s#%PYRECOMMENDS%#$(shell python3 -c "import distutils.core; \
 		setup = distutils.core.run_setup('setup.py'); \
-		print(', '.join(['python3-'+x for y in setup.extras_require.values() for x in y]))" \
+		print(', '.join(sorted(['python3-'+x for y in setup.extras_require.values() for x in y])))" \
 	)#" debian/tests/control.tmp
 	@sed -i "s,python3-python-debian,python3-debian," debian/tests/control.tmp
 	@sed -i "s,python3-rpm-python,python3-rpm," debian/tests/control.tmp


=====================================
debian/tests/control
=====================================
@@ -7,7 +7,7 @@
 #   $ mv debian/tests/control.tmp debian/tests/control
 
 Tests: pytest-with-recommends
-Depends: diffoscope, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, python3-distro, python3-argcomplete, python3-progressbar, python3-binwalk, python3-defusedxml, python3-guestfs, python3-jsondiff, python3-debian, python3-pypdf2, python3-pyxattr, python3-rpm, python3-tlsh
+Depends: diffoscope, python3-pytest, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], abootimg, acl, apktool [!ppc64el !s390x], binutils-multiarch, bzip2, caca-utils, colord, db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, fontforge-extras, fp-utils [!ppc64el !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg, imagemagick, jsbeautifier, libarchive-tools, llvm, lz4 | liblz4-tool, mono-utils, ocaml-nox, odt2txt, openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf2, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
 
 Tests: pytest
 Depends: diffoscope, python3-pytest, file



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/b618777cfc2a8d236476d1cb1be3b0d03462b6aa

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/commit/b618777cfc2a8d236476d1cb1be3b0d03462b6aa
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/20181111/51ad4a37/attachment.html>


More information about the rb-commits mailing list