[Git][reproducible-builds/diffoscope][master] 7 commits: Init changelog

Mattia Rizzolo gitlab at salsa.debian.org
Tue Oct 9 13:16:35 CEST 2018 

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
fb183239 by Mattia Rizzolo at 2018-10-09T09:24:01Z
Init changelog

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

- - - - -
225a30b4 by Mattia Rizzolo at 2018-10-09T09:25:23Z
d/control: Build-Depend on linux-image-amd64 [amd64] to allow squashfs tests to run.

Thanks: Marek Marczykowski-Górecki for making me notice they weren't actually running.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
d7ec9965 by Mattia Rizzolo at 2018-10-09T09:59:25Z
Rename the tool procyon-decompiler to procyon.

I couldn't find any version of procyon in the archive where the binary
was called procyon-decompiler; as a result this comparator was probably
never run.

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

- - - - -
dc3634e5 by Mattia Rizzolo at 2018-10-09T10:19:24Z
Add a Build-Conflicts against graphicsmagick-imagemagick-compat

This package Provides:imagemagick, but doesn't ship the "compare" tool.

See: #910652

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

- - - - -
1e109bc0 by Mattia Rizzolo at 2018-10-09T10:44:02Z
Move the list of optional python packages into setup.py, and have dh_python3 check the generated requires.txt

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

- - - - -
71eb7e3f by Mattia Rizzolo at 2018-10-09T11:10:09Z
Also add the optional python modules to the autopkgtest dependencies

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

- - - - -
018b7aea by Mattia Rizzolo at 2018-10-09T11:15:43Z
Temporarily drop Build-Depends and Test-Depends on apktool and oggvideotools, as they are not available in buster at the moment.

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

- - - - -


10 changed files:

- .gitlab-ci.yml
- debian/changelog
- debian/control
- debian/rules
- debian/tests/control
- debian/tests/control.in
- diffoscope/comparators/java.py
- diffoscope/external_tools.py
- setup.py
- tests/comparators/test_java.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -15,9 +15,6 @@ unstable:
 testing:
   <<: *test
   image: debian:testing
-  # in testing the build-dependencies are not installable.
-  # keep trying, but ignore the failures
-  allow_failure: true
 
 stable-bpo:
   <<: *test


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+diffoscope (104) UNRELEASED; urgency=medium
+
+  [ Chris Lamb ]
+  * comparators.macho: Prevent a traceback if the filename cannot be found
+    on the line.  Closes: #910540
+
+ -- Mattia Rizzolo <mattia at debian.org>  Tue, 09 Oct 2018 11:23:10 +0200
+
 diffoscope (103) unstable; urgency=medium
 
   [ Mattia Rizzolo ]


=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Uploaders:
  Ximin Luo <infinity0 at debian.org>,
 Build-Depends:
  abootimg <!nocheck>,
- apktool [!ppc64el !s390x] <!nocheck>,
+# apktool [!ppc64el !s390x] <!nocheck>,
  bash-completion,
  binutils-multiarch <!nocheck>,
  caca-utils <!nocheck>,
@@ -40,11 +40,12 @@ Build-Depends:
  libjs-jquery-isonscreen <!nocheck>,
  libjs-jquery-tablesorter <!nocheck>,
  libjs-jquery-throttle-debounce <!nocheck>,
+ linux-image-amd64 [amd64] <!nocheck>,
  llvm <!nocheck>,
  lz4 <!nocheck> | liblz4-tool <!nocheck>,
  mono-utils <!nocheck>,
  odt2txt <!nocheck>,
- oggvideotools [!s390x] <!nocheck>,
+# oggvideotools [!s390x] <!nocheck>,
  openssh-client <!nocheck>,
  pgpdump <!nocheck>,
  poppler-utils <!nocheck>,
@@ -75,6 +76,7 @@ Build-Depends:
  unzip <!nocheck>,
  xmlbeans <!nocheck>,
  xxd <!nocheck> | vim-common <!nocheck>,
+Build-Conflicts: graphicsmagick-imagemagick-compat
 Standards-Version: 4.2.1
 Rules-Requires-Root: no
 Homepage: https://diffoscope.org


=====================================
debian/rules
=====================================
@@ -46,17 +46,9 @@ override_dh_auto_build: debian/diffoscope.bash-completion
 
 override_dh_python3:
 	dh_python3 -p diffoscope \
-		--depends=distro \
-		--recommends=argcomplete \
-		--recommends=binwalk \
-		--recommends=defusedxml \
-		--recommends=guestfs \
-		--recommends=jsondiff \
-		--recommends=progressbar \
-		--recommends=python-debian \
-		--recommends=pyxattr \
-		--recommends=rpm-python \
-		--recommends=tlsh \
+		--depends-section=distro_detection \
+		--recommends-section=cmdline \
+		--recommends-section=comparators \
 
 override_dh_gencontrol:
 	bin/diffoscope --list-debian-substvars >> debian/diffoscope.substvars
@@ -79,9 +71,17 @@ override_dh_auto_clean:
 	@echo "#" >> debian/tests/control.tmp
 	@cat debian/tests/control.in >> debian/tests/control.tmp
 	@sed -i "s#%RECOMMENDS%#$(shell bin/diffoscope --list-debian-substvars | cut -d= -f2)#" debian/tests/control.tmp
-	@sed -i "s,apktool,apktool [!ppc64el !s390x]," 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]))" \
+	)#" 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
+	#@sed -i "s,apktool,apktool [!ppc64el !s390x]," debian/tests/control.tmp
+	@sed -i "s/apktool, //" debian/tests/control.tmp
 	@sed -i "s,fp-utils,fp-utils [!ppc64el !s390x]," debian/tests/control.tmp
-	@sed -i "s,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp
+	#@sed -i "s,oggvideotools,oggvideotools [!s390x]," debian/tests/control.tmp
+	@sed -i "s/oggvideotools, //" debian/tests/control.tmp
 	@set -e ; if ! diff -q debian/tests/control debian/tests/control.tmp ; then \
 		echo ;\
 		echo "The generated control file differs from the actual one." ;\


=====================================
debian/tests/control
=====================================
@@ -2,7 +2,7 @@
 # EDIT debian/tests/control.in INSTEAD!
 #
 Tests: pytest-with-recommends
-Depends: diffoscope, python3-pytest, file, 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, odt2txt, oggvideotools [!s390x], openssh-client, pgpdump, poppler-utils, procyon-decompiler, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, tcpdump, unzip, xmlbeans, xxd | vim-common, xz-utils
+Depends: diffoscope, python3-pytest, file, abootimg, acl, 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, 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-pyxattr, python3-rpm, python3-tlsh
 
 Tests: pytest
 Depends: diffoscope, python3-pytest, file


=====================================
debian/tests/control.in
=====================================
@@ -1,5 +1,5 @@
 Tests: pytest-with-recommends
-Depends: diffoscope, python3-pytest, file, %RECOMMENDS%
+Depends: diffoscope, python3-pytest, file, %RECOMMENDS%, %PYRECOMMENDS%
 
 Tests: pytest
 Depends: diffoscope, python3-pytest, file


=====================================
diffoscope/comparators/java.py
=====================================
@@ -37,9 +37,9 @@ class ProcyonDecompiler(Command):
         super().__init__(path, *args, **kwargs)
         self.real_path = os.path.realpath(path)
 
-    @tool_required('procyon-decompiler')
+    @tool_required('procyon')
     def cmdline(self):
-        return ['procyon-decompiler', '-ec', self.path]
+        return ['procyon', '-ec', self.path]
 
     def filter(self, line):
         if re.match(r'^(//)', line.decode('utf-8')):


=====================================
diffoscope/external_tools.py
=====================================
@@ -264,7 +264,7 @@ EXTERNAL_TOOLS = {
         'arch': 'unzip',
         'FreeBSD': 'unzip',
     },
-    'procyon-decompiler': {
+    'procyon': {
         'debian': 'procyon-decompiler',
     },
     'dumpxsb': {


=====================================
setup.py
=====================================
@@ -54,6 +54,17 @@ setup(
     ],
     extras_require={
         'distro_detection': ['distro'],
+        'cmdline': ['argcomplete', 'progressbar'],
+        'comparators': [
+            'binwalk',
+            'defusedxml',
+            'guestfs',
+            'jsondiff',
+            'python-debian',
+            'pyxattr',
+            'rpm-python',
+            'tlsh',
+        ],
     },
     classifiers=[
         'Development Status :: 3 - Alpha',


=====================================
tests/comparators/test_java.py
=====================================
@@ -74,7 +74,7 @@ def compare_non_existing(monkeypatch, class1, decompiler):
     assert len(difference.details) > 0
 
 
- at skip_unless_tools_exist('procyon-decompiler')
+ at skip_unless_tools_exist('procyon')
 def test_diff_procyon(differences_procyon):
     diff(differences_procyon, 'procyon_class_expected_diff')
 
@@ -84,7 +84,7 @@ def test_diff_javap(differences_javap):
     diff(differences_javap, 'javap_class_expected_diff')
 
 
- at skip_unless_tools_exist('procyon-decompiler')
+ at skip_unless_tools_exist('procyon')
 def test_compare_non_existing_procyon(monkeypatch, class1):
     compare_non_existing(monkeypatch, class1, ProcyonDecompiler)
 



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/56f8215cc1ebba04b6ca1e6430dc1420a8974750...018b7aea28074f09647ecd1cc96fc072147e02d9

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/compare/56f8215cc1ebba04b6ca1e6430dc1420a8974750...018b7aea28074f09647ecd1cc96fc072147e02d9
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/20181009/13eb48ae/attachment.html>

More information about the rb-commits mailing list