[Git][reproducible-builds/diffoscope][master] 2 commits: debian/control: Remove old Breaks/Replaces that have been obsoleted since bullseye

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
40cd80fc by Mattia Rizzolo at 2022-09-19T13:30:42+02:00
debian/control: Remove old Breaks/Replaces that have been obsoleted since bullseye

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

- - - - -
2f2d803f by Mattia Rizzolo at 2022-09-19T15:35:47+02:00
Use pep517 and pip to load the requirements

this is somewhat hacky.
Probably a better solution for the future is to move to
pyproject.toml instead of setup.py, and parse that here.

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

- - - - -


2 changed files:

- debian/control
- debian/tests/control.sh


Changes:

=====================================
debian/control
=====================================
@@ -68,6 +68,8 @@ Build-Depends:
  python3-libarchive-c,
  python3-magic,
  python3-pdfminer <!nocheck>,
+ python3-pep517,
+ python3-pip,
  python3-progressbar <!nocheck>,
  python3-pypdf2 <!nocheck>,
  python3-pytest <!nocheck>,
@@ -105,8 +107,6 @@ Depends:
 Recommends:
  ${diffoscope-minimal:Recommends},
  ${python3:Recommends},
-Breaks: diffoscope (<< 162~)
-Replaces: diffoscope (<< 162~)
 Description: in-depth visual diff tool for files, archives and directories (minimal package)
  diffoscope is a visual diff tool that attempts try to get to the bottom of
  what makes files or directories actually different.


=====================================
debian/tests/control.sh
=====================================
@@ -12,9 +12,10 @@ cat debian/tests/control.in >> debian/tests/control.tmp
 
 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 "import distutils.core; \
-	setup = distutils.core.run_setup('setup.py'); \
-	print(', '.join(sorted(['python3-{}'.format(x) for y in setup.extras_require.values() for x in y])))" \
+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
 
 # Don't test-depend on radare2; not in bullseye for security reasons. (#950372)



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/be78cf7d84f97b00335f4b2190a962e1c0bd33af...2f2d803f989082d5701576871e9c300a5126f78d

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/be78cf7d84f97b00335f4b2190a962e1c0bd33af...2f2d803f989082d5701576871e9c300a5126f78d
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/20220919/aedec727/attachment.htm>