Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package diffoscope for openSUSE:Factory checked in at 2023-01-21 19:12:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffoscope (Old) and /work/SRC/openSUSE:Factory/.diffoscope.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "diffoscope" Sat Jan 21 19:12:29 2023 rev:39 rq:1060127 version:233 Changes: -------- --- /work/SRC/openSUSE:Factory/diffoscope/diffoscope.changes 2023-01-18 14:23:16.976106263 +0100 +++ /work/SRC/openSUSE:Factory/.diffoscope.new.32243/diffoscope.changes 2023-01-21 19:13:21.577914762 +0100 @@ -1,0 +2,15 @@ +Sat Jan 21 11:18:35 UTC 2023 - Dirk Müller <[email protected]> + +- update to 233: + * Split packaging metadata into an extras_require.json file instead of using + the pep517 and the pip modules directly. This was causing build failures if + not using a virtualenv and/or building without internet access. + * Add an external tool reference for GNU Guix (lzip). + * Drop an external tool reference for GNU Guix (pedump). + * Split inline Python code in shell script to generate test dependencies to a + separate Python script. + * No need for "from __future__ import print_function" import in setup.py + anymore. + * Comment and tidy the new extras_require.json handling. + +------------------------------------------------------------------- Old: ---- diffoscope-232.tar.bz2 diffoscope-232.tar.bz2.asc New: ---- diffoscope-233.tar.bz2 diffoscope-233.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffoscope.spec ++++++ --- /var/tmp/diff_new_pack.l9iQUl/_old 2023-01-21 19:13:22.073917656 +0100 +++ /var/tmp/diff_new_pack.l9iQUl/_new 2023-01-21 19:13:22.077917679 +0100 @@ -17,7 +17,7 @@ Name: diffoscope -Version: 232 +Version: 233 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later ++++++ diffoscope-232.tar.bz2 -> diffoscope-233.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/MANIFEST.in new/diffoscope-233/MANIFEST.in --- old/diffoscope-232/MANIFEST.in 2023-01-13 08:05:04.000000000 +0100 +++ new/diffoscope-233/MANIFEST.in 2023-01-20 17:56:26.000000000 +0100 @@ -1,5 +1,6 @@ include COPYING include README.rst include CONTRIBUTING.md +include extras_require.json include pyproject.toml graft tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/debian/changelog new/diffoscope-233/debian/changelog --- old/diffoscope-232/debian/changelog 2023-01-13 08:05:04.000000000 +0100 +++ new/diffoscope-233/debian/changelog 2023-01-20 17:56:26.000000000 +0100 @@ -1,3 +1,24 @@ +diffoscope (233) unstable; urgency=medium + + [ FC Stegerman ] + * Split packaging metadata into an extras_require.json file instead of using + the pep517 and the pip modules directly. This was causing build failures if + not using a virtualenv and/or building without internet access. + (Closes: #1029066, reproducible-builds/diffoscope#325) + + [ Vagrant Cascadian ] + * Add an external tool reference for GNU Guix (lzip). + * Drop an external tool reference for GNU Guix (pedump). + + [ Chris Lamb ] + * Split inline Python code in shell script to generate test dependencies to a + separate Python script. + * No need for "from __future__ import print_function" import in setup.py + anymore. + * Comment and tidy the new extras_require.json handling. + + -- Chris Lamb <[email protected]> Fri, 20 Jan 2023 08:56:22 -0800 + diffoscope (232) unstable; urgency=medium [ Chris Lamb ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/debian/control new/diffoscope-233/debian/control --- old/diffoscope-232/debian/control 2023-01-13 08:05:04.000000000 +0100 +++ new/diffoscope-233/debian/control 2023-01-20 17:56:26.000000000 +0100 @@ -73,8 +73,6 @@ python3-libarchive-c, python3-magic, python3-pdfminer <!nocheck>, - python3-pep517, - python3-pip, python3-progressbar <!nocheck>, python3-pypdf2 <!nocheck>, python3-pytest <!nocheck>, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/debian/tests/control.sh new/diffoscope-233/debian/tests/control.sh --- old/diffoscope-232/debian/tests/control.sh 2023-01-13 08:05:04.000000000 +0100 +++ new/diffoscope-233/debian/tests/control.sh 2023-01-20 17:56:26.000000000 +0100 @@ -12,11 +12,7 @@ sed -i "s#%RECOMMENDS%#$(bin/diffoscope --list-debian-substvars | awk -F= '/diffoscope:Recommends/ { print $2 }')#" debian/tests/control.tmp -sed -i "s#%PYRECOMMENDS%#$(python3 -c "from pep517 import meta; \ - from pip._internal.req.constructors import install_req_from_req_string; \ - dist = meta.load('.'); \ - print(', '.join([f'python3-{install_req_from_req_string(req).name}' for req in sorted(dist.requires) if install_req_from_req_string(req).markers]))" \ -)#" debian/tests/control.tmp +sed -i "s#%PYRECOMMENDS%#$(debian/tests/generate-recommends.py)#" debian/tests/control.tmp # Don't test-depend on radare2; not in bullseye for security reasons. (#950372) sed -i "s#radare2, ##" debian/tests/control.tmp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/debian/tests/generate-recommends.py new/diffoscope-233/debian/tests/generate-recommends.py --- old/diffoscope-232/debian/tests/generate-recommends.py 1970-01-01 01:00:00.000000000 +0100 +++ new/diffoscope-233/debian/tests/generate-recommends.py 2023-01-20 17:56:26.000000000 +0100 @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 + +import json + +# Load extras_require dict from external JSON file. This allows it to be easily +# shared by the main setup.py script. +with open("extras_require.json") as f: + extras_require = json.load(f) + +xs = set(f"python3-{x}" for reqs in extras_require.values() for x in reqs) + +print(", ".join(sorted(xs))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/diffoscope/__init__.py new/diffoscope-233/diffoscope/__init__.py --- old/diffoscope-232/diffoscope/__init__.py 2023-01-13 08:05:04.000000000 +0100 +++ new/diffoscope-233/diffoscope/__init__.py 2023-01-20 17:56:26.000000000 +0100 @@ -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 = "232" +VERSION = "233" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/diffoscope/external_tools.py new/diffoscope-233/diffoscope/external_tools.py --- old/diffoscope-232/diffoscope/external_tools.py 2023-01-13 08:05:04.000000000 +0100 +++ new/diffoscope-233/diffoscope/external_tools.py 2023-01-20 17:56:26.000000000 +0100 @@ -127,7 +127,7 @@ "guix": "e2fsprogs", }, "lz4": {"debian": "lz4 | liblz4-tool", "FreeBSD": "lz4", "guix": "lz4"}, - "lzip": {"debian": "lzip"}, + "lzip": {"debian": "lzip", "guix": "lzip"}, "msgunfmt": { "debian": "gettext", "arch": "gettext", @@ -170,7 +170,6 @@ "debian": "mono-utils", "arch": "mono", "FreeBSD": "mono", - "guix": "mono", }, "ppudump": { "debian": "fp-utils", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/extras_require.json new/diffoscope-233/extras_require.json --- old/diffoscope-232/extras_require.json 1970-01-01 01:00:00.000000000 +0100 +++ new/diffoscope-233/extras_require.json 2023-01-20 17:56:26.000000000 +0100 @@ -0,0 +1,21 @@ +{ + "distro_detection": [ + "distro" + ], + "cmdline": [ + "argcomplete", + "progressbar" + ], + "comparators": [ + "androguard", + "binwalk", + "defusedxml", + "guestfs", + "jsondiff", + "python-debian", + "pypdf", + "pyxattr", + "rpm-python", + "tlsh" + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/diffoscope-232/setup.py new/diffoscope-233/setup.py --- old/diffoscope-232/setup.py 2023-01-13 08:05:04.000000000 +0100 +++ new/diffoscope-233/setup.py 2023-01-20 17:56:26.000000000 +0100 @@ -1,9 +1,8 @@ #!/usr/bin/env python3 -from __future__ import print_function - -import sys import diffoscope +import json +import sys from setuptools import setup, find_packages from setuptools.command.test import test as TestCommand @@ -34,6 +33,11 @@ sys.exit(errno) +# Load extras_require dict from external JSON file. This allows it to be easily +# shared by the debian/tests/generate-recommends.py script. +with open("extras_require.json") as f: + extras_require = json.load(f) + setup( name="diffoscope", version=diffoscope.VERSION, @@ -56,22 +60,7 @@ "python-magic", "libarchive-c", ], - extras_require={ - "distro_detection": ["distro"], - "cmdline": ["argcomplete", "progressbar"], - "comparators": [ - "androguard", - "binwalk", - "defusedxml", - "guestfs", - "jsondiff", - "python-debian", - "pypdf", - "pyxattr", - "rpm-python", - "tlsh", - ], - }, + extras_require=extras_require, python_requires=">=3.7", classifiers=[ "Development Status :: 3 - Alpha",
