Source: gavodachs
Version: 2.9.1+dfsg-1
Severity: normal

Following the plan in https://bugs.debian.org/1085728, here's a patch to
cope with this package renaming.  It should be applied before the new
python-multipart version is uploaded to unstable.  Once
python3-python-multipart reaches testing, the Depends can be simplified
at your leisure to just "python3-python-multipart <!nocheck>".

By the way, when testing this, I noticed that your package's autopkgtest
fails if you try to run it in a simple unshare container (e.g. via
"sbuild --chroot-mode=unshare --run-autopkgtest") and if the host system
has a PostgreSQL server running.  This is exactly what the
"isolation-container" restriction is for ("The test wants to start
services or open network TCP ports"), so I'd recommend adding that to
the Restrictions field in debian/tests/control.

Thanks,

-- 
Colin Watson (he/him)                              [cjwat...@debian.org]
>From 02b43e93a31c9de2a4696a9d3b87d4ed7da4ee74 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwat...@debian.org>
Date: Thu, 28 Nov 2024 22:37:32 +0000
Subject: [PATCH] Accept renamed python3-python-multipart

See #1085728.
---
 debian/changelog                      |  6 +++++
 debian/control                        |  2 +-
 debian/patches/python_multipart.patch | 37 +++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/python_multipart.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index bcc4f8d..6ac8974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gavodachs (2.10+dfsg-1.1) UNRELEASED; urgency=medium
+
+  * Accept renamed python3-python-multipart (see #1085728).
+
+ -- Colin Watson <cjwat...@debian.org>  Thu, 28 Nov 2024 22:20:55 +0000
+
 gavodachs (2.10+dfsg-1) unstable; urgency=medium
 
   * Updating watchfile for two-digit minor versions
diff --git a/debian/control b/debian/control
index 9881e09..908e7cf 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: libjs-jquery,
          python3-gavo-votable (= ${binary:Version}),
          python3-lxml,
          python3-matplotlib,
-         python3-multipart,
+         python3-multipart (<< 0.1) | python3-python-multipart,
          python3-pkg-resources,
          python3-psycopg2,
          python3-pymoc,
diff --git a/debian/patches/python_multipart.patch b/debian/patches/python_multipart.patch
new file mode 100644
index 0000000..8e85e9f
--- /dev/null
+++ b/debian/patches/python_multipart.patch
@@ -0,0 +1,37 @@
+From: Colin Watson <cjwat...@debian.org>
+Date: Thu, 28 Nov 2024 22:20:06 +0000
+Subject: Use new python_multipart package name
+
+Forwarded: no
+Last-Update: 2024-11-28
+---
+ gavo/formal/twistedpatch.py | 2 +-
+ setup.py                    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gavo/formal/twistedpatch.py b/gavo/formal/twistedpatch.py
+index 76ce158..eae8b58 100644
+--- a/gavo/formal/twistedpatch.py
++++ b/gavo/formal/twistedpatch.py
+@@ -361,7 +361,7 @@ def _loadNevowData(request, tag, renderFactory):
+ 
+ from urllib import parse as urlparse
+ 
+-from multipart import multipart
++from python_multipart import multipart
+ from twisted.web import server
+ from twisted.web.http import parse_qs
+ 
+diff --git a/setup.py b/setup.py
+index 9f4cedb..2fcbebb 100755
+--- a/setup.py
++++ b/setup.py
+@@ -21,7 +21,7 @@ if "DACHS_PIP_MESS" in os.environ:
+ 	# Note that this is not tested regularly.  So, if there is breakage,
+ 	# please report.
+ 	install_requires = [
+-		"astropy", "cryptography", "docutils", "lxml", "matplotlib", "numpy", "Pillow", "setuptools", "psycopg2", "pymoc", "pyparsing", "rjsmin", "testresources", "twisted", "python-multipart", "PyOpenSSL",
++		"astropy", "cryptography", "docutils", "lxml", "matplotlib", "numpy", "Pillow", "setuptools", "psycopg2", "pymoc", "pyparsing", "rjsmin", "testresources", "twisted", "python-multipart>=0.0.13", "PyOpenSSL",
+ 	]
+ else:
+ 	install_requires = []
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1c4c785
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+python_multipart.patch
-- 
2.45.2

Reply via email to