[Debian-med-packaging] Bug#1078562: resfinder: diff for NMU version 4.4.2-1.1

[Boyuan Yang]

Control: tags 1078562 + patch
Control: tags 1078562 + pending

Dear maintainer,

I've prepared an NMU for resfinder (versioned as 4.4.2-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru resfinder-4.4.2/debian/changelog resfinder-4.4.2/debian/changelog
--- resfinder-4.4.2/debian/changelog	2024-01-16 02:02:14.000000000 -0500
+++ resfinder-4.4.2/debian/changelog	2024-10-31 20:10:43.000000000 -0400
@@ -1,3 +1,16 @@
+resfinder (4.4.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/pyproject.toml-Migrate-to-pdm-backend.patch:
+    Add patch from upstream new version to migrate from python3-pdm-pep517
+    to python3-pdm-backend. (Closes: #1078562)
+
+  [ Michael R. Crusoe ]
+  * d/tests/control: since skip-not-installable is specified, there is
+    no reason to restrict the archictures anymore.
+
+ -- Boyuan Yang <byang at debian.org>  Thu, 31 Oct 2024 20:10:43 -0400
+
  resfinder (4.4.2-1) unstable; urgency=medium

    * New upstream version
diff -Nru resfinder-4.4.2/debian/control resfinder-4.4.2/debian/control
--- resfinder-4.4.2/debian/control	2024-01-16 02:02:14.000000000 -0500
+++ resfinder-4.4.2/debian/control	2024-10-31 20:10:31.000000000 -0400
@@ -10,7 +10,6 @@
                 python3,
                 python3-cgelib,
                 python3-pdm-backend,
-               python3-pdm-pep517
  Standards-Version: 4.6.2
  Vcs-Browser: https://salsa.debian.org/med-team/resfinder
  Vcs-Git: https://salsa.debian.org/med-team/resfinder.git
diff -Nru 
resfinder-4.4.2/debian/patches/pyproject.toml-Migrate-to-pdm-backend.patch 
resfinder-4.4.2/debian/patches/pyproject.toml-Migrate-to-pdm-backend.patch
--- 
resfinder-4.4.2/debian/patches/pyproject.toml-Migrate-to-pdm-backend.patch 
1969-12-31 19:00:00.000000000 -0500
+++ 
resfinder-4.4.2/debian/patches/pyproject.toml-Migrate-to-pdm-backend.patch 
2024-10-31 20:09:27.000000000 -0400
@@ -0,0 +1,36 @@
+From: Boyuan Yang <byang at debian.org>
+Date: Thu, 31 Oct 2024 20:08:53 -0400
+Subject: pyproject.toml: Migrate to pdm-backend
+
+Applied-Upstream: 
https://bitbucket.org/genomicepidemiology/resfinder/commits/73df31f68fb0bc004620c2cbff851cbb9152927d
+Bug-Debian: https://bugs.debian.org/1078562
+---
+ pyproject.toml | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index b6541dc..73320d0 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -17,10 +17,9 @@ requires-python = ">=3.8"
+ readme = "README.md"
+ license = {text = "Apache-2.0"}
+
+-[project.optional-dependencies]
+-
+-[tool.pdm]
+-version = {from = "src/resfinder/__init__.py"}
++[tool.pdm.version]
++source = "file"
++path = "src/resfinder/__init__.py"
+
+ [tool.pdm.dev-dependencies]
+ test = [
+@@ -32,5 +31,5 @@ test = "python -m pytest tests/"
+ resfinder = "python -m resfinder"
+
+ [build-system]
+-requires = ["pdm-pep517>=0.12.0"]
+-build-backend = "pdm.pep517.api"
++requires = ["pdm-backend"]
++build-backend = "pdm.backend"
diff -Nru resfinder-4.4.2/debian/patches/series 
resfinder-4.4.2/debian/patches/series
--- resfinder-4.4.2/debian/patches/series	2024-01-16 02:02:14.000000000 
-0500
+++ resfinder-4.4.2/debian/patches/series	2024-10-31 20:09:42.000000000 
-0400
@@ -1,3 +1,4 @@
  fix_path_in_testscript.patch
  fix-shebang.patch
  mut-type.patch
+pyproject.toml-Migrate-to-pdm-backend.patch
diff -Nru resfinder-4.4.2/debian/tests/control 
resfinder-4.4.2/debian/tests/control
--- resfinder-4.4.2/debian/tests/control	2024-01-16 02:02:14.000000000 -0500
+++ resfinder-4.4.2/debian/tests/control	2024-10-31 20:06:59.000000000 -0400
@@ -1,9 +1,6 @@
  Tests: run-unit-test
  Depends: @, resfinder-db (>= 0.0+git20220524.fa32d9a-1~)
  Restrictions: allow-stderr, skip-not-installable
-# Architecture restriction on tests is made necessary by the dependency 
on kma,
-# which does not support running on other architectures than 64-bit. 
(#994259)
-Architecture: any-amd64 arm64 mips64el ppc64el s390x alpha ia64 ppc64 
riscv64 sparc64

  Tests: version-test
  Depends: @
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/debian-med-packaging/attachments/20241031/e8b1d30e/attachment-0001.sig>