from:"Stefano Rivera"

Bug#1001388: bullseye-pu: package python-virtualenv/20.4.0+ds-2+deb11u1

2021-12-09 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian@packages.debian.org
Usertags: pu

An easy bug fix in python-virtualenv on bullseye, for a bug in one of
our patches.
Already fixed in unstable, without any reported regressions.

[ Reason ]
This fails on bullseye, at the moment:
$ virtualenv -p python3 --no-setuptools testve

The patch fixes it.

[ Impact ]
While --no-setuptools is probably an unusual flag, a user filed the bug,
so it's hitting people in the real world.

[ Tests ]
Autopkgtests pass.
I manually tested the affected code.

[ Risks ]
Very minimal change.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
Avoid a KeyError in python by not looking up the key unless we've
verified it's in the dict.

[ Other info ]

Uploaded to the queue.
diff -Nru python-virtualenv-20.4.0+ds/debian/changelog 
python-virtualenv-20.4.0+ds/debian/changelog
--- python-virtualenv-20.4.0+ds/debian/changelog2021-06-20 
17:31:30.0 -0400
+++ python-virtualenv-20.4.0+ds/debian/changelog2021-12-09 
09:34:08.0 -0400
@@ -1,3 +1,10 @@
+python-virtualenv (20.4.0+ds-2+deb11u1) bullseye; urgency=medium
+
+  * include-pkg_resources.patch: Avoid KeyError when building a virtualenv
+with --no-setuptools, thanks Mathieu Parent. (Closes: #994953)
+
+ -- Stefano Rivera   Thu, 09 Dec 2021 09:34:08 -0400
+
 python-virtualenv (20.4.0+ds-2) unstable; urgency=medium
 
   * Patch: Fix --upgrade-embed-wheels.
diff -Nru 
python-virtualenv-20.4.0+ds/debian/patches/include-pkg_resources.patch 
python-virtualenv-20.4.0+ds/debian/patches/include-pkg_resources.patch
--- python-virtualenv-20.4.0+ds/debian/patches/include-pkg_resources.patch  
2021-06-20 17:31:30.0 -0400
+++ python-virtualenv-20.4.0+ds/debian/patches/include-pkg_resources.patch  
2021-12-09 09:34:08.0 -0400
@@ -6,9 +6,9 @@
 Forwarded: not-needed
 Last-Update: 2021-07-20
 ---
- src/virtualenv/seed/embed/pip_invoke.py| 9 -
- src/virtualenv/seed/embed/via_app_data/via_app_data.py | 9 -
- 2 files changed, 16 insertions(+), 2 deletions(-)
+ src/virtualenv/seed/embed/pip_invoke.py|  9 -
+ src/virtualenv/seed/embed/via_app_data/via_app_data.py | 10 +-
+ 2 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/src/virtualenv/seed/embed/pip_invoke.py 
b/src/virtualenv/seed/embed/pip_invoke.py
 index c935c02..275330b 100644
@@ -45,7 +45,7 @@
  cmd.extend(["--find-links", str(folder)])
  yield cmd
 diff --git a/src/virtualenv/seed/embed/via_app_data/via_app_data.py 
b/src/virtualenv/seed/embed/via_app_data/via_app_data.py
-index 9a98a70..4d82594 100644
+index 9a98a70..9c879cc 100644
 --- a/src/virtualenv/seed/embed/via_app_data/via_app_data.py
 +++ b/src/virtualenv/seed/embed/via_app_data/via_app_data.py
 @@ -10,7 +10,8 @@ from threading import Lock, Thread
@@ -58,14 +58,15 @@
  from virtualenv.util.path import Path
  
  from .pip_install.copy import CopyPipInstall
-@@ -123,6 +124,12 @@ class FromAppData(BaseEmbed):
+@@ -123,6 +124,13 @@ class FromAppData(BaseEmbed):
  thread.start()
  for thread in threads:
  thread.join()
 +
 +# Debian specific: Since Debian splits out pkg_resources from
 +# setuptools, for a local virtualenv, we need to add it to the base.
-+if name_to_whl['setuptools'].path.is_relative_to(BUNDLE_FOLDER):
++if ('setuptools' in name_to_whl and
++name_to_whl['setuptools'].path.is_relative_to(BUNDLE_FOLDER)):
 +_get('pkg_resources', Version.bundle)
 +
  if fail:

Bug#1000812: [RFH] Bug#1000812: pyrle: import fails on Python 3.10

2021-12-04 Thread Stefano Rivera

Hi Nilesh (2021.12.04_15:15:05_+)
> Would you have any hint on this?
> Is it a bug with the python3 package itself?

You're waiting for python3-tabulate to be patched for Python 3.10
support.

I added a bug blocking link.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#1000774: python3-matplotlib: Segfault on mips64el in draw

2021-11-28 Thread Stefano Rivera

Package: python3-matplotlib
Version: 3.5.0-2
Severity: serious
Justification: FTBFS
Affects: deap

deap FTBFS on mips64el, in matplotlib, I'd assume this is a matploptlib
regression on mips64el:

Current thread 0x00fff7382010 (most recent call first):
  File "/usr/lib/python3/dist-packages/matplotlib/collections.py", line 422 in 
draw
  File "/usr/lib/python3/dist-packages/matplotlib/artist.py", line 50 in 
draw_wrapper
  File "/usr/lib/python3/dist-packages/matplotlib/collections.py", line 989 in 
draw
  File "/usr/lib/python3/dist-packages/matplotlib/artist.py", line 50 in 
draw_wrapper
  File "/usr/lib/python3/dist-packages/mpl_toolkits/mplot3d/art3d.py", line 532 
in draw
  File "/usr/lib/python3/dist-packages/matplotlib/image.py", line 132 in 
_draw_list_compositin
g_images
  File "/usr/lib/python3/dist-packages/matplotlib/axes/_base.py", line 3082 in 
draw
  File "/usr/lib/python3/dist-packages/matplotlib/artist.py", line 50 in 
draw_wrapper
  File "/usr/lib/python3/dist-packages/mpl_toolkits/mplot3d/axes3d.py", line 
469 in draw
  File "/usr/lib/python3/dist-packages/matplotlib/artist.py", line 50 in 
draw_wrapper
  File "/usr/lib/python3/dist-packages/matplotlib/image.py", line 132 in 
_draw_list_compositin
g_images
  File "/usr/lib/python3/dist-packages/matplotlib/figure.py", line 2803 in draw
  File "/usr/lib/python3/dist-packages/matplotlib/artist.py", line 50 in 
draw_wrapper
  File "/usr/lib/python3/dist-packages/matplotlib/artist.py", line 73 in 
draw_wrapper
  File "/usr/lib/python3/dist-packages/matplotlib/backends/backend_agg.py", 
line 436 in draw
  File "/usr/lib/python3/dist-packages/matplotlib/backends/backend_agg.py", 
line 540 in print_
png
  File "/usr/lib/python3/dist-packages/matplotlib/_api/deprecation.py", line 
412 in wrapper
  File "/usr/lib/python3/dist-packages/matplotlib/backend_bases.py", line 1643 
in wrapper
  File "/usr/lib/python3/dist-packages/matplotlib/backend_bases.py", line 2314 
in print_figure
  File "/usr/lib/python3/dist-packages/matplotlib/figure.py", line 3012 in 
savefig
  File "/usr/lib/python3/dist-packages/matplotlib/sphinxext/plot_directive.py", 
line 647 in re
nder_figures
  File "/usr/lib/python3/dist-packages/matplotlib/sphinxext/plot_directive.py", 
line 789 in ru
n
  File "/usr/lib/python3/dist-packages/matplotlib/sphinxext/plot_directive.py", 
line 259 in ru
n
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
2147 in run_directive
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
2097 in directive
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
2355 in explicit_construct
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
2343 in explicit_markup
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 451 in 
check_line
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239 in 
run
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
197 in run
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
282 in nested_parse
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
394 in new_subsection
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
328 in section
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
2770 in underline
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 451 in 
check_line
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239 in 
run
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
197 in run
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
282 in nested_parse
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
394 in new_subsection
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
328 in section
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
3009 in text
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 451 in 
check_line
  File "/usr/lib/python3/dist-packages/docutils/statemachine.py", line 239 in 
run
  File "/usr/lib/python3/dist-packages/docutils/parsers/rst/states.py", line 
171 in run
  File "/usr/lib/python3/dist-packages/sphinx/parsers.py", line 101 in parse
  File "/usr/lib/python3/dist-packages/docutils/readers/__init__.py", line 78 
in parse
  File "/usr/lib/python3/dist-packages/sphinx/io.py", line 109 in read
  File "/usr/lib/python3/dist-packages/docutils/core.py", line 217 in publish
  File "/usr/lib/python3/dist-packages/sphinx/io.py", line 189 in read_doc
  File "/usr/lib/python3/dist-packages/sphinx/builders/__init__.py", line 476 
in read_doc
  File "/usr/lib/python3/dist-packages/sphinx/builders/__init__.py", line 436 
in _read_serial
  File "/usr/lib/python3/dist-packages/sphinx/builders/__init__.py", line 415 
in read
  File

Bug#997719: libvirt-python: diff for NMU version 7.9.0-0.1

2021-11-24 Thread Stefano Rivera

e_libvirtaio
+This function says we have libvirtaio on Python >= 3.3,
+however we already mandate Python >= 3.5 at the start of the file.
+
+
+
+2021-04-07 Andrea Bolognani  
+
+ci: Move dco job to sanity_checks stage
+If the DCO check fails we still want the pipeline to fail, but
+that doesn't mean there's no value in running the other jobs to
+get a better picture.
+
+
+
+2021-04-07 Andrea Bolognani  
+
+ci: Use 'extends' GitLab CI feature
+This is the recommended way to use templates in job
+definitions.
+
+
+
+2021-04-06 Ján Tomko  
+
+ci: drop openSUSE leap 15.1 in favor of 15.2
+
+
+2021-04-06 Ján Tomko  
+
+ci: refresh dockerfiles
+Refresh to match libvirt-ci commit 94c25bde639eb31ff2071fb6abfd3d5c777f4ab2
+
+
+
+2021-04-01 Jiri Denemark  
+
+Post-release version bump to 7.3.0
+
+
+2021-03-01 Jiri Denemark  
+
+Post-release version bump to 7.2.0
+
+
+2021-03-01 renlei4  
+
+Fix wrong type for BlockThreshold Callback
+type of threshold and excess are unsigned long long,
+but PyObject_CallMethod incorrectly set it to int.
+
+if threshold or excess greater than 0x7FFF(max int),
+those variables will overflow.
+
+
+
+2021-02-15 Daniel P. Berrangé  
+
+Add impl override for virDomainGetMessages
+
+
+2021-02-09 Beraldo Leal  
+
+improving readme with requirements
+When installing this library in a fresh system, some basic packages are
+necessary to compile and run. This patch will add basic instructions
+with some requirements to help new contributors and users.
+
+
+
+2021-01-15 Jiri Denemark  
+
+Post-release version bump to 7.1.0
+
+
 2020-12-15 Daniel P. Berrangé  
 
 ci: refresh containers for CentOS-8 PowerTools repo rename
diff -Nru libvirt-python-7.0.0/debian/changelog libvirt-python-7.9.0/debian/changelog
--- libvirt-python-7.0.0/debian/changelog	2021-02-18 03:45:20.0 -0400
+++ libvirt-python-7.9.0/debian/changelog	2021-11-24 20:02:38.0 -0400
@@ -1,3 +1,11 @@
+libvirt-python (7.9.0-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release
+(Closes: #997719)
+
+ -- Stefano Rivera   Wed, 24 Nov 2021 20:02:38 -0400
+
 libvirt-python (7.0.0-2) unstable; urgency=medium
 
   * Upload to unstable 
diff -Nru libvirt-python-7.0.0/examples/event-test.py libvirt-python-7.9.0/examples/event-test.py
--- libvirt-python-7.0.0/examples/event-test.py	2020-12-01 04:54:25.366521600 -0400
+++ libvirt-python-7.9.0/examples/event-test.py	2021-11-01 08:22:56.095336200 -0400
@@ -640,6 +640,10 @@
 print("myDomainEventMemoryFailureCallback: Domain %s(%s) memory failure recipient %d action %d flags %d" % (
 dom.name(), dom.ID(), recipient, action, flags))
 
+def myDomainEventMemoryDeviceSizeChangeCallback(conn: libvirt.virConnect, dom: libvirt.virDomain, recipient: int, action: int, flags: int, opaque: _T) -> None:
+print("myDomainEventMemoryDeviceSizeChangeCallback: Domain %s(%s) memory device size change alias %s size %d" % (
+dom.name(), dom.ID(), alias, size))
+
 
 ##
 # Network events
@@ -793,6 +797,7 @@
 vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_METADATA_CHANGE, myDomainEventMetadataChangeCallback, None),
 vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD, myDomainEventBlockThresholdCallback, None),
 vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MEMORY_FAILURE, myDomainEventMemoryFailureCallback, None),
+vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MEMORY_DEVICE_SIZE_CHANGE, myDomainEventMemoryDeviceSizeChangeCallback, None),
 ]
 
 netcallbacks = [
diff -Nru libvirt-python-7.0.0/generator.py libvirt-python-7.9.0/generator.py
--- libvirt-python-7.0.0/generator.py	2020-12-01 04:54:25.369855000 -0400
+++ libvirt-python-7.9.0/generator.py	2021-10-01 04:38:50.84098 -0400
@@ -479,6 +479,8 @@
 'virDomainGetGuestInfo',
 'virDomainAuthorizedSSHKeysGet',
 'virDomainAuthorizedSSHKeysSet',
+'virDomainGetMessages',
+'virNodeDeviceGetAutostart',
 }
 
 lxc_skip_impl = {
@@ -1236,13 +1238,16 @@
 elif name[0:13] == "virStorageVol":
 func = name[13:]
 func = func[0:1].lower() + func[1:]
+elif name[0:16] == "virNodeDeviceGet":
+func = name[16].lower() + name[17:]
+elif name[0:19] == "virNodeDeviceLookup":
+func = name[3].lower() + name[4:]
+elif name[0:22] == "virNodeDeviceCreateXML":
+func = name[3].lower() + name[4:]
+elif name[0:19] == "virNodeDeviceDefine":
+func = name[3].lower() + name[4:]
 elif name[0:13] == "virNodeDevice":
-if n

Bug#998471: gpgme1.0: diff for NMU version 1.16.0-1.2

2021-11-23 Thread Stefano Rivera

Control: tags 998471 + patch
Control: tags 998471 + pending

Dear maintainer,

Turns out the bug is actually that autoconf has a hardcoded list of
Python versions and 3.10 isn't in the list. When it is in the list,
there is also a bug somewhere that treats it as python 3.1.

But... Let's just avoid the hardcoded list entirely, I've prepared an
NMU to do that.

I've prepared an NMU for gpgme1.0 (versioned as 1.16.0-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Also filed as https://salsa.debian.org/debian/gpgme/-/merge_requests/3

Regards,

SR
diff -Nru gpgme1.0-1.16.0/debian/changelog gpgme1.0-1.16.0/debian/changelog
--- gpgme1.0-1.16.0/debian/changelog	2021-09-15 01:31:55.0 -0400
+++ gpgme1.0-1.16.0/debian/changelog	2021-11-23 21:15:08.0 -0400
@@ -1,3 +1,10 @@
+gpgme1.0 (1.16.0-1.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Avoid a hardcoded list of known Python versions. (Closes: #998471)
+
+ -- Stefano Rivera   Tue, 23 Nov 2021 21:15:08 -0400
+
 gpgme1.0 (1.16.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru gpgme1.0-1.16.0/debian/patches/0004-core-Fix-use-after-free-issue-in-test.patch gpgme1.0-1.16.0/debian/patches/0004-core-Fix-use-after-free-issue-in-test.patch
--- gpgme1.0-1.16.0/debian/patches/0004-core-Fix-use-after-free-issue-in-test.patch	1969-12-31 20:00:00.0 -0400
+++ gpgme1.0-1.16.0/debian/patches/0004-core-Fix-use-after-free-issue-in-test.patch	2021-11-23 21:15:08.0 -0400
@@ -0,0 +1,122 @@
+From: =?utf-8?q?Ingo_Kl=C3=B6cker?= 
+Date: Sat, 26 Jun 2021 18:02:47 +0200
+Subject: core: Fix use-after-free issue in test
+
+* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New.
+(main): Factored out signing and verifying the result.
+--
+
+Factoring the two steps of the test into different functions fixes the
+use-after-free issue that was caused by accidentaly using a variable
+of the first step in the second step.
+
+GnuPG-bug-id: 5509
+---
+ tests/gpg/t-edit-sign.c | 54 +
+ 1 file changed, 37 insertions(+), 17 deletions(-)
+
+diff --git a/tests/gpg/t-edit-sign.c b/tests/gpg/t-edit-sign.c
+index 2f98362..e0494c5 100644
+--- a/tests/gpg/t-edit-sign.c
 b/tests/gpg/t-edit-sign.c
+@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd)
+ }
+ 
+ 
+-int
+-main (int argc, char **argv)
++void
++sign_key (const char *key_fpr, const char *signer_fpr)
+ {
+   gpgme_ctx_t ctx;
+   gpgme_error_t err;
+   gpgme_data_t out = NULL;
+-  const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
+   gpgme_key_t signing_key = NULL;
+-  const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
+   gpgme_key_t key = NULL;
+-  gpgme_key_t signed_key = NULL;
+-  gpgme_user_id_t signed_uid = NULL;
+-  gpgme_key_sig_t key_sig = NULL;
+   char *agent_info;
+-  int mode;
+-
+-  (void)argc;
+-  (void)argv;
+-
+-  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+ 
+   err = gpgme_new ();
+   fail_if_err (err);
+ 
+-  /* Sign the key */
+   agent_info = getenv("GPG_AGENT_INFO");
+   if (!(agent_info && strchr (agent_info, ':')))
+ gpgme_set_passphrase_cb (ctx, passphrase_cb, 0);
+@@ -159,8 +147,23 @@ main (int argc, char **argv)
+   gpgme_data_release (out);
+   gpgme_key_unref (key);
+   gpgme_key_unref (signing_key);
++  gpgme_release (ctx);
++}
++
++
++void
++verify_key_signature (const char *key_fpr, const char *signer_keyid)
++{
++  gpgme_ctx_t ctx;
++  gpgme_error_t err;
++  gpgme_key_t signed_key = NULL;
++  gpgme_user_id_t signed_uid = NULL;
++  gpgme_key_sig_t key_sig = NULL;
++  int mode;
++
++  err = gpgme_new ();
++  fail_if_err (err);
+ 
+-  /* Verify the key signature */
+   mode  = gpgme_get_keylist_mode (ctx);
+   mode |= GPGME_KEYLIST_MODE_SIGS;
+   err = gpgme_set_keylist_mode (ctx, mode);
+@@ -168,7 +171,7 @@ main (int argc, char **argv)
+   err = gpgme_get_key (ctx, key_fpr, _key, 0);
+   fail_if_err (err);
+ 
+-  signed_uid = key->uids;
++  signed_uid = signed_key->uids;
+   if (!signed_uid)
+ {
+   fprintf (stderr, "Signed key has no user IDs\n");
+@@ -180,7 +183,7 @@ main (int argc, char **argv)
+   exit (1);
+ }
+   key_sig = signed_uid->signatures->next;
+-  if (strcmp ("2D727CC768697734", key_sig->keyid))
++  if (strcmp (signer_keyid, key_sig->keyid))
+ {
+   fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n",
+ key_sig->keyid);
+@@ -196,6 +199,23 @@ main (int argc, char **argv)
+ 
+   gpgme_key_unref (signed_key);
+   gpgme_release (ctx);
++}
++
++
++int
++main (int argc, char **argv)
++{
++  const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
++  const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16;
++  const char *key_f

Bug#1000204: pyfai: diff for NMU version 0.20.0+dfsg1-4.1

2021-11-22 Thread Stefano Rivera

Control: tags 1000204 + pending

Dear maintainer,

I've prepared an NMU for pyfai (versioned as 0.20.0+dfsg1-4.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Also filed as https://salsa.debian.org/science-team/pyfai/-/merge_requests/4

Regards,

SR
diff -Nru pyfai-0.20.0+dfsg1/debian/changelog pyfai-0.20.0+dfsg1/debian/changelog
--- pyfai-0.20.0+dfsg1/debian/changelog	2021-09-19 07:57:57.0 -0400
+++ pyfai-0.20.0+dfsg1/debian/changelog	2021-11-22 21:29:59.0 -0400
@@ -1,3 +1,10 @@
+pyfai (0.20.0+dfsg1-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Python 3.10 support, thanks Lukas Märdian. (Closes: #1000204)
+
+ -- Stefano Rivera   Mon, 22 Nov 2021 21:29:59 -0400
+
 pyfai (0.20.0+dfsg1-4) unstable; urgency=medium
 
   * Bug fix: "Removal of the python3-*-dbg packages in sid/bookworm",
diff -Nru pyfai-0.20.0+dfsg1/debian/patches/0009-Fix-collections.MutableSets-compat-with-python3.10.patch pyfai-0.20.0+dfsg1/debian/patches/0009-Fix-collections.MutableSets-compat-with-python3.10.patch
--- pyfai-0.20.0+dfsg1/debian/patches/0009-Fix-collections.MutableSets-compat-with-python3.10.patch	1969-12-31 20:00:00.0 -0400
+++ pyfai-0.20.0+dfsg1/debian/patches/0009-Fix-collections.MutableSets-compat-with-python3.10.patch	2021-11-22 21:29:59.0 -0400
@@ -0,0 +1,45 @@
+From: Lukas Märdian 
+Date: Mon, 22 Nov 2021 21:30:44 -0400
+Subject: Fix collections.MutableSets compat with python3.10
+
+collections.MutableSet was deprecated a long time ago and removed with python3.10.
+https://docs.python.org/3/whatsnew/3.10.html#removed
+https://bugs.python.org/issue37324
+
+Using the old class name leads to test failures such as this one:
+==
+ERROR: test_import_all_modules (pyFAI.test.test_bug_regression.TestBugRegression)
+Try to import every single module in the package
+--
+Traceback (most recent call last):
+  File "/<>/pyfai-0.20.0+dfsg1/.pybuild/cpython3_3.10_pyfai/build/pyFAI/test/test_bug_regression.py", line 286, in test_import_all_modules
+raise err
+  File "/<>/pyfai-0.20.0+dfsg1/.pybuild/cpython3_3.10_pyfai/build/pyFAI/test/test_bug_regression.py", line 271, in test_import_all_modules
+load_source(fqn, path)
+  File "/<>/pyfai-0.20.0+dfsg1/.pybuild/cpython3_3.10_pyfai/build/pyFAI/test/test_bug_regression.py", line 78, in load_source
+spec.loader.exec_module(module)
+  File "", line 883, in exec_module
+  File "", line 241, in _call_with_frames_removed
+  File "/<>/pyfai-0.20.0+dfsg1/.pybuild/cpython3_3.10_pyfai/build/pyFAI/utils/orderedset.py", line 30, in 
+class OrderedSet(collections.MutableSet):
+AttributeError: module 'collections' has no attribute 'MutableSet'
+
+Origin: vendor, Ubuntu
+Forwarded: https://github.com/silx-kit/pyFAI/pull/1588
+---
+ pyFAI/utils/orderedset.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyFAI/utils/orderedset.py b/pyFAI/utils/orderedset.py
+index de097cf..417490f 100644
+--- a/pyFAI/utils/orderedset.py
 b/pyFAI/utils/orderedset.py
+@@ -27,7 +27,7 @@
+ import collections
+ 
+ 
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+ 
+ def __init__(self, iterable=None):
+ self.end = end = []
diff -Nru pyfai-0.20.0+dfsg1/debian/patches/series pyfai-0.20.0+dfsg1/debian/patches/series
--- pyfai-0.20.0+dfsg1/debian/patches/series	2021-09-19 07:57:57.0 -0400
+++ pyfai-0.20.0+dfsg1/debian/patches/series	2021-11-22 21:29:59.0 -0400
@@ -6,3 +6,4 @@
 0006-fix-a-couple-of-test-failing-with-i386.patch
 0007-cleaner-test.patch
 0008-tunning.patch
+0009-Fix-collections.MutableSets-compat-with-python3.10.patch

Bug#999519: xrayutilities: diff for NMU version 1.7.1-2.1

2021-11-22 Thread Stefano Rivera

Control: tags 999519 + patch
Control: tags 999519 + pending

Dear maintainer,

I've prepared an NMU for xrayutilities (versioned as 1.7.1-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Also filed as: 
https://salsa.debian.org/science-team/python-xrayutilities/-/merge_requests/1

Regards,

SR
diff -Nru xrayutilities-1.7.1/debian/changelog xrayutilities-1.7.1/debian/changelog
--- xrayutilities-1.7.1/debian/changelog	2021-09-19 08:54:46.0 -0400
+++ xrayutilities-1.7.1/debian/changelog	2021-11-22 21:22:36.0 -0400
@@ -1,3 +1,10 @@
+xrayutilities (1.7.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: matplotlib 3.5 support (Closes: #999519)
+
+ -- Stefano Rivera   Mon, 22 Nov 2021 21:22:36 -0400
+
 xrayutilities (1.7.1-2) unstable; urgency=medium
 
   * Corrected Profile nodocs -> nodoc
diff -Nru xrayutilities-1.7.1/debian/patches/0005-Fix-matplotlib-3.5-issue.patch xrayutilities-1.7.1/debian/patches/0005-Fix-matplotlib-3.5-issue.patch
--- xrayutilities-1.7.1/debian/patches/0005-Fix-matplotlib-3.5-issue.patch	1969-12-31 20:00:00.0 -0400
+++ xrayutilities-1.7.1/debian/patches/0005-Fix-matplotlib-3.5-issue.patch	2021-11-22 21:22:36.0 -0400
@@ -0,0 +1,35 @@
+From: Dominik Kriegner 
+Date: Fri, 12 Nov 2021 12:30:16 +0100
+Subject: Fix matplotlib-3.5 issue.
+
+reported by Debian. The best solution seems to be to avoid the
+problematic keyword argument since we anyhow specified the default
+value.
+
+Bug-Debian: https://bugs.debian.org/999519
+---
+ lib/xrayutilities/simpack/fit.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/xrayutilities/simpack/fit.py b/lib/xrayutilities/simpack/fit.py
+index 8e71783..5d49dcf 100644
+--- a/lib/xrayutilities/simpack/fit.py
 b/lib/xrayutilities/simpack/fit.py
+@@ -13,7 +13,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+-# Copyright (C) 2016-2020 Dominik Kriegner 
++# Copyright (C) 2016-2021 Dominik Kriegner 
+ 
+ import warnings
+ 
+@@ -208,7 +208,7 @@ class FitModel(object):
+ else:
+ self.zord = 1
+ if self.logscale:
+-self.ax.set_yscale("log", nonposy='clip')
++self.ax.set_yscale("log")
+ self.fline = None
+ 
+ def showplot(self, xlab=self.lmodel.xlabelstr,
diff -Nru xrayutilities-1.7.1/debian/patches/series xrayutilities-1.7.1/debian/patches/series
--- xrayutilities-1.7.1/debian/patches/series	2021-09-19 08:54:46.0 -0400
+++ xrayutilities-1.7.1/debian/patches/series	2021-11-22 21:22:36.0 -0400
@@ -2,3 +2,4 @@
 0002-Desactivated-pdf-generation-for-the-doc.patch
 0003-Do-not-change-PYTHONPATH-during-the-build.patch
 0004-Used-the-system-Mathjax.patch
+0005-Fix-matplotlib-3.5-issue.patch

Bug#1000428: gammapy: FTBFS with matplotlib 3.5

2021-11-22 Thread Stefano Rivera

Source: gammapy
Version: 0.18.2-1
Severity: serious
Justification: FTBFS

Matplotlib 3.5 seems to have caused some test failures:
=== short test summary info 
FAILED gammapy/datasets/tests/test_map.py::test_plot_residual_onoff - ValueEr...
FAILED gammapy/datasets/tests/test_spectrum.py::test_peek - TypeError: Unsupp...
FAILED gammapy/datasets/tests/test_spectrum.py::TestSpectrumOnOff::test_peek
FAILED gammapy/datasets/tests/test_spectrum.py::TestSpectrumOnOff::test_plot_fit
FAILED 
gammapy/irf/tests/test_edisp_map.py::test_edispkernel_from_diagonal_response
FAILED gammapy/irf/tests/test_edisp_map.py::test_edispkernel_from_1D - KeyErr...
FAILED gammapy/makers/background/tests/test_reflected.py::test_bad_on_region
FAILED gammapy/maps/tests/test_region.py::test_width - AssertionError: 
FAILED gammapy/maps/tests/test_regionnd.py::test_region_nd_map_plot - TypeErr...
FAILED gammapy/modeling/models/tests/test_spectral.py::test_model_plot - Type...
= 10 failed, 1157 passed, 479 skipped, 2 xfailed, 3 xpassed in 82.49s (0:01:22) 
=

With both Python 3.9 and 3.10.

See: 
https://buildd.debian.org/status/fetch.php?pkg=gammapy=amd64=0.18.2-1%2Bb1=1637623734=0

SR

Bug#1000427: pyregion: FTBFS with setuptools >= 58

2021-11-22 Thread Stefano Rivera

Source: pyregion
Version: 2.1.1-1
Severity: serious
Tags: upstream
Justification: FTBFS

pyregion fails to build with setuptools >= 58, which dropped use_2to3
support.:

/usr/lib/python3/dist-packages/setuptools/dist.py:294: DistDeprecationWarning: 
use_2to3 is ignored.
  warnings.warn(f"{attr} is ignored.", DistDeprecationWarning)

See the full log:
https://buildd.debian.org/status/fetch.php?pkg=pyregion=amd64=2.1.1-1%2Bb1=1637589214=0

SR

Bug#1000423: python-biom-format: FTBFS with Python 3.10 - Test failures

2021-11-22 Thread Stefano Rivera

Source: python-biom-format
Version: 2.1.10-2
Severity: serious
Tags: upstream
Justification: FTBFS
Block -1 with 1000422

python-biom-format FTBFS with Python 3.10:
=== short test summary info 
ERROR biom/tests/test_err.py
ERROR biom/tests/test_parse.py
ERROR biom/tests/test_table.py
ERROR biom/tests/test_util.py
ERROR biom/tests/test_cli/test_add_metadata.py
ERROR biom/tests/test_cli/test_show_install_info.py
ERROR biom/tests/test_cli/test_subset_table.py
ERROR biom/tests/test_cli/test_summarize_table.py
ERROR biom/tests/test_cli/test_table_converter.py
ERROR biom/tests/test_cli/test_table_normalizer.py
ERROR biom/tests/test_cli/test_uc_processor.py
ERROR biom/tests/test_cli/test_validate_table.py
!!! Interrupted: 12 errors during collection !!!
== 12 errors in 2.27s ==
E: pybuild pybuild:354: test: plugin distutils failed with: exit code=2: cd 
/<>/.pybuild/cpython3_3.10_biom-format/build; python3.10 -m pytest

See: 
https://buildd.debian.org/status/fetch.php?pkg=python-biom-format=amd64=2.1.10-2%2Bb1=1637570066=0

I adapted an upstream patch, in 
https://salsa.debian.org/med-team/python-biom-format/-/merge_requests/1

But it still doesn't build because we need pandas, first.

SR

Bug#1000422: pandas: FTBFS with Python 3.10 - Test failures

2021-11-22 Thread Stefano Rivera

Source: pandas
Version: 1.1.5+dfsg-2
Severity: serious
Justification: FTBFS

Pandas fails to build with Python 3.10.
See: 
https://buildd.debian.org/status/fetch.php?pkg=pandas=amd64=1.1.5%2Bdfsg-2%2Bb1=1637461771=0

=== FAILURES ===
 TestDatetime64SeriesComparison.test_comparison_invalid[None-DataFrame] 

left =0  1  2  3  4
0  0  1  2  3  4
right =0  1  2  3  4
0 2001-01-01 2001-01-02 2001-01-03 2001-01-04 2001-01-05
box = 

def assert_invalid_comparison(left, right, box):
"""
Assert that comparison operations with mismatched types behave 
correctly.

Parameters
--
left : np.ndarray, ExtensionArray, Index, or Series
right : object
box : {pd.DataFrame, pd.Series, pd.Index, tm.to_array}
"""
# Not for tznaive-tzaware comparison

# Note: not quite the same as how we do this for tm.box_expected
xbox = box if box is not Index else np.array

result = left == right
expected = xbox(np.zeros(result.shape, dtype=np.bool_))

tm.assert_equal(result, expected)

result = right == left
tm.assert_equal(result, expected)

result = left != right
tm.assert_equal(result, ~expected)

result = right != left
tm.assert_equal(result, ~expected)

msg = "|".join(
[
"Invalid comparison between",
"Cannot compare type",
"not supported between",
"invalid type promotion",
(
# GH#36706 npdev 1.20.0 2020-09-28
r"The DTypes  and "
r" do not have a common 
DType. "
"For example they cannot be stored in a single array unless 
the "
"dtype is `object`."
),
]
)
with pytest.raises(TypeError, match=msg):
>   left < right

pandas/tests/arithmetic/common.py:89:

Looks like upstream has got there, but a quick search didn't find the
relevant patches, yet:
https://github.com/pandas-dev/pandas/commit/e7efd02c71c48c7968b2f8fdb845a0b0bf61a3fa

SR

Bug#1000419: pymatgen: FTBFS - Test failure: BSPlotterProjectedTest.test_methods

2021-11-22 Thread Stefano Rivera

Source: pymatgen
Version: 2022.0.14+dfsg1-1
Severity: serious
Justification: FTBFS

Presumably due to a new matplotlib, but I'm just guessing...

.pybuild/test_python3.9/pymatgen/electronic_structure/tests/test_plotter.py . [ 
55%]
.F

=== FAILURES ===
_ BSPlotterProjectedTest.test_methods __

self = 

def test_methods(self):
self.plotter.get_elt_projected_plots().close()
self.plotter.get_elt_projected_plots_color().close()
self.plotter.get_projected_plots_dots({"Cu": ["d", "s"], "O": 
["p"]}).close()
>   self.plotter.get_projected_plots_dots_patom_pmorb(
{"Cu": ["dxy", "s", "px"], "O": ["px", "py", "pz"]},
{"Cu": [3, 5], "O": [1]},
).close()

.pybuild/test_python3.9/pymatgen/electronic_structure/tests/test_plotter.py:220:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
.pybuild/test_python3.9/pymatgen/electronic_structure/plotter.py:1651: in 
get_projected_plots_dots_patom_pmorb
plt.subplot(row + 1, 2, count)
/usr/lib/python3/dist-packages/matplotlib/pyplot.py:1268: in subplot
key = SubplotSpec._from_subplot_args(fig, args)
/usr/lib/python3/dist-packages/matplotlib/gridspec.py:595: in _from_subplot_args
gs = GridSpec._check_gridspec_exists(figure, rows, cols)
/usr/lib/python3/dist-packages/matplotlib/gridspec.py:223: in 
_check_gridspec_exists
return GridSpec(nrows, ncols, figure=figure)
/usr/lib/python3/dist-packages/matplotlib/gridspec.py:383: in __init__
super().__init__(nrows, ncols,
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

self = <[AttributeError("'GridSpec' object has no attribute 
'_row_height_ratios'") raised in repr()] GridSpec object at 0x7f507628bf40>
nrows = 5.5, ncols = 2, height_ratios = None, width_ratios = None

def __init__(self, nrows, ncols, height_ratios=None, width_ratios=None):
"""
Parameters
--
nrows, ncols : int
The number of rows and columns of the grid.
width_ratios : array-like of length *ncols*, optional
Defines the relative widths of the columns. Each column gets a
relative width of ``width_ratios[i] / sum(width_ratios)``.
If not given, all columns will have the same width.
height_ratios : array-like of length *nrows*, optional
Defines the relative heights of the rows. Each column gets a
relative height of ``height_ratios[i] / sum(height_ratios)``.
If not given, all rows will have the same height.
"""
if not isinstance(nrows, Integral) or nrows <= 0:
>   raise ValueError(
f"Number of rows must be a positive integer, not {nrows!r}")
E   ValueError: Number of rows must be a positive integer, not 5.5

/usr/lib/python3/dist-packages/matplotlib/gridspec.py:47: ValueError
- Captured stdout call -
You do not want to sum projection over orbitals.
You do not want to sum projection over atoms.
Number of subfigures: 9
{'start_index': 0, 'end_index': 15, 'name': '\\Gamma-X'}
{'start_index': 16, 'end_index': 31, 'name': 'X-M'}
{'start_index': 32, 'end_index': 47, 'name': 'M-\\Gamma'}
{'start_index': 48, 'end_index': 63, 'name': '\\Gamma-R'}
{'start_index': 64, 'end_index': 79, 'name': 'R-X'}
{'start_index': 80, 'end_index': 95, 'name': 'M-R'}
dictio_d: {'Cu': ['dxy', 's', 'px'], 'O': ['px', 'py', 'pz']}
dictpa_d: {'Cu': ['3', '5'], 'O': ['1']}
=== warnings summary ===


See: 
https://buildd.debian.org/status/fetch.php?pkg=pymatgen=amd64=2022.0.14%2Bdfsg1-1%2Bb1=1637567905=0

SR

Bug#1000360: segyio: diff for NMU version 1.8.3-1.1

2021-11-21 Thread Stefano Rivera

Control: tags 1000360 + pending

Dear maintainer,

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

Also filed as:
https://salsa.debian.org/science-team/segyio/-/merge_requests/1

I'd really suggest a new upstream release, instead, though...

Regards,

SR
diff -Nru segyio-1.8.3/debian/changelog segyio-1.8.3/debian/changelog
--- segyio-1.8.3/debian/changelog	2018-12-23 08:17:03.0 -0400
+++ segyio-1.8.3/debian/changelog	2021-11-21 22:51:13.0 -0400
@@ -1,3 +1,12 @@
+segyio (1.8.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Python 3.10 support. (Closes: #1000360)
+- Patch: Import from collections.abc.
+- Patch: PY_SSIZE_T_CLEAN.
+
+ -- Stefano Rivera   Sun, 21 Nov 2021 22:51:13 -0400
+
 segyio (1.8.3-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru segyio-1.8.3/debian/patches/python-3.10-collections.abc.patch segyio-1.8.3/debian/patches/python-3.10-collections.abc.patch
--- segyio-1.8.3/debian/patches/python-3.10-collections.abc.patch	1969-12-31 20:00:00.0 -0400
+++ segyio-1.8.3/debian/patches/python-3.10-collections.abc.patch	2021-11-21 22:51:13.0 -0400
@@ -0,0 +1,210 @@
+From: =?utf-8?q?J=C3=B8rgen_Kvalsvik?= 
+Date: Mon, 7 Oct 2019 13:42:35 +0200
+Subject: Try-import collections.abc
+
+In python 3.8 [1], importing the abstract base classes from collections
+will break. Protecting the import in try is both backwards- and forward
+compatible, as collections.abc is not valid in python2.
+
+[1] DeprecationWarning: Using or importing the ABCs from 'collections'
+instead of from 'collections.abc' is deprecated, and in 3.8 it will
+stop working
+
+Origin: upstream, https://github.com/equinor/segyio/commit/b6378fb2a283c504209b55e1d1af402d4d765e11
+Bug-Debian: https://bugs.debian.org/1000360
+---
+ python/segyio/depth.py |  7 ++-
+ python/segyio/field.py | 17 +++--
+ python/segyio/line.py  | 14 +-
+ python/segyio/trace.py | 18 +++---
+ 4 files changed, 37 insertions(+), 19 deletions(-)
+
+diff --git a/python/segyio/depth.py b/python/segyio/depth.py
+index 948e1e5..7346cfa 100644
+--- a/python/segyio/depth.py
 b/python/segyio/depth.py
+@@ -1,3 +1,8 @@
++try:
++from collections.abc import Sequence # noqa
++except ImportError:
++from collections import Sequence # noqa
++
+ import numpy as np
+ try: from future_builtins import zip
+ except ImportError: pass
+@@ -23,7 +28,7 @@ class Depth(Sequence):
+ .. versionadded:: 1.1
+ 
+ .. versionchanged:: 1.6
+-common list operations (collections.Sequence)
++common list operations (Sequence)
+ 
+ .. versionchanged:: 1.7.1
+enabled for unstructured files
+diff --git a/python/segyio/field.py b/python/segyio/field.py
+index f6e8a46..8389935 100644
+--- a/python/segyio/field.py
 b/python/segyio/field.py
+@@ -1,10 +1,15 @@
+-import collections
++try:
++from collections.abc import Mapping # noqa
++from collections.abc import MutableMapping # noqa
++except ImportError:
++from collections import Mapping # noqa
++from collections import MutableMapping # noqa
+ 
+ import segyio
+ from .binfield import BinField
+ from .tracefield import TraceField
+ 
+-class Field(collections.MutableMapping):
++class Field(MutableMapping):
+ """
+ The Field implements the dict interface, with a fixed set of keys. It's
+ used for both binary- and trace headers. Any modifications to this
+@@ -22,7 +27,7 @@ class Field(collections.MutableMapping):
+ common dict operations (update, keys, values)
+ 
+ .. versionchanged:: 1.6
+-more common dict operations (collections.MutableMapping)
++more common dict operations (MutableMapping)
+ """
+ _bin_keys = [x for x in BinField.enums()
+  if  x != BinField.Unassigned1
+@@ -438,7 +443,7 @@ class Field(collections.MutableMapping):
+ def __eq__(self, other):
+ """x.__eq__(y) <==> x == y"""
+ 
+-if not isinstance(other, collections.Mapping):
++if not isinstance(other, Mapping):
+ return NotImplemented
+ 
+ if len(self) != len(other):
+@@ -492,13 +497,13 @@ class Field(collections.MutableMapping):
+ 
+ buf = bytearray(self.buf)
+ 
+-# Implementation largely borrowed from collections.mapping
++# Implementation largely borrowed from Mapping
+ # If E present and has a .keys() method: for k in E: D[k] = E[k]
+ # If E present and lacks .keys() method: for (k, v) in E: D[k] = v
+ # In either case, this is followed by: for k, v in F.items(): D[k] = v
+ if len(args) == 1:
+ other = args[0]
+-if isinstance(other, collections.Mapping):
++if isinstance(other, Mapping):
+ for key in other:
+ self.pu

Bug#1000360: segyio: FTBFS with Python 3.10

2021-11-21 Thread Stefano Rivera

Source: segyio
Version: 1.8.3-1
Severity: serious
Tags: upstream patch
Justification: FTBFS

FTBFS with Python 3.10:

Tests fail with:
E   AttributeError: module 'collections' has no attribute 'Mapping'

See: 
https://buildd.debian.org/status/fetch.php?pkg=segyio=amd64=1.8.3-1%2Bb5=1637491602=0

Looks like upstream fixed this issue years ago, updating to a new
upstream version would probably be good.

But, in the meantime, we can probably patch it.

SR

Bug#1000359: FTBFS: test failure: External MBEDTLS version mismatch

2021-11-21 Thread Stefano Rivera

Source: python-biopython
Version: 1.79+dfsg-1
Severity: serious
Justification: FTBFS
Control: block -1 with 1000358

python-biopython FTBFS with tests failing like so:
==
FAIL: test_tblastx (test_NCBI_BLAST_tools.CheckCompleteArgList)
Check all tblastx arguments are supported.
--
Traceback (most recent call last):
  File 
"/<>/.pybuild/cpython3_3.9/build/Tests/test_NCBI_BLAST_tools.py", 
line 424, in test_tblastx
self.check("tblastx", Applications.NcbitblastxCommandline)
  File 
"/<>/.pybuild/cpython3_3.9/build/Tests/test_NCBI_BLAST_tools.py", 
line 388, in check
self.assertEqual(stderrdata, "", "%s\n%s" % (cline, stderrdata))
AssertionError: 'Critical: External MBEDTLS version mismat[36 chars]me\n' != ''
- Critical: External MBEDTLS version mismatch: 2.16.9 headers vs. 2.16.11 
runtime
 : /usr/bin/tblastx -h
Critical: External MBEDTLS version mismatch: 2.16.9 headers vs. 2.16.11 runtime


--

See: 
https://buildd.debian.org/status/fetch.php?pkg=python-biopython=amd64=1.79%2Bdfsg-1%2Bb1=1637490185=0

Looks like ncbi-blast+ needs to be rebuilt.

SR

Bug#1000358: ncbi-blast+: Please rebuild against MBEDTLS 2.16.11

2021-11-21 Thread Stefano Rivera

Package: ncbi-blast+
Version: 2.11.0+ds-1
Severity: normal
Affects: python-biopython

Running blastn outputs:
Critical: External MBEDTLS version mismatch: 2.16.9 headers vs. 2.16.11 runtime

This causes python-biopython to FTBFS:
==
FAIL: test_blastn (test_NCBI_BLAST_tools.CheckCompleteArgList)
Check all blastn arguments are supported.
--
Traceback (most recent call last):
  File 
"/<>/.pybuild/cpython3_3.9/build/Tests/test_NCBI_BLAST_tools.py", 
line 420, in test_blastn
self.check("blastn", Applications.NcbiblastnCommandline)
  File 
"/<>/.pybuild/cpython3_3.9/build/Tests/test_NCBI_BLAST_tools.py", 
line 388, in check
self.assertEqual(stderrdata, "", "%s\n%s" % (cline, stderrdata))
AssertionError: 'Critical: External MBEDTLS version mismat[36 chars]me\n' != ''
- Critical: External MBEDTLS version mismatch: 2.16.9 headers vs. 2.16.11 
runtime
 : /usr/bin/blastn -h
Critical: External MBEDTLS version mismatch: 2.16.9 headers vs. 2.16.11 runtime

See: 
https://buildd.debian.org/status/fetch.php?pkg=python-biopython=amd64=1.79%2Bdfsg-1%2Bb1=1637490185=0

SR

Bug#1000337: pairtools: diff for NMU version 0.3.0-3.1

2021-11-21 Thread Stefano Rivera

Dear maintainer,

I've prepared an NMU for pairtools (versioned as 0.3.0-3.1). The diff
is attached to this message.

Also filed as https://salsa.debian.org/med-team/pairtools/-/merge_requests/1

Regards,

SR
diff -Nru pairtools-0.3.0/debian/changelog pairtools-0.3.0/debian/changelog
--- pairtools-0.3.0/debian/changelog	2021-09-22 09:50:11.0 -0400
+++ pairtools-0.3.0/debian/changelog	2021-11-21 16:13:08.0 -0400
@@ -1,3 +1,10 @@
+pairtools (0.3.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Support Python 3.10. (Closes: #1000337)
+
+ -- Stefano Rivera   Sun, 21 Nov 2021 16:13:08 -0400
+
 pairtools (0.3.0-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru pairtools-0.3.0/debian/patches/python-3.10 pairtools-0.3.0/debian/patches/python-3.10
--- pairtools-0.3.0/debian/patches/python-3.10	1969-12-31 20:00:00.0 -0400
+++ pairtools-0.3.0/debian/patches/python-3.10	2021-11-21 16:13:08.0 -0400
@@ -0,0 +1,26 @@
+From: Stefano Rivera 
+Date: Sun, 21 Nov 2021 16:00:00 -0400
+Subject: Import Mapping from collections.abc
+
+The collections alias was dropped in Python 3.10.
+
+Bug-Debian: https://bugs.debian.org/1000337
+Forwarded: https://github.com/open2c/pairtools/pull/108
+---
+ pairtools/pairtools_stats.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pairtools/pairtools_stats.py b/pairtools/pairtools_stats.py
+index b1c05d4..842c77e 100644
+--- a/pairtools/pairtools_stats.py
 b/pairtools/pairtools_stats.py
+@@ -7,7 +7,8 @@ import click
+ 
+ import numpy as np
+ 
+-from collections import OrderedDict, Mapping
++from collections import OrderedDict
++from collections.abc import Mapping
+ 
+ from . import _fileio, _pairsam_format, cli, _headerops, common_io_options
+ 
diff -Nru pairtools-0.3.0/debian/patches/series pairtools-0.3.0/debian/patches/series
--- pairtools-0.3.0/debian/patches/series	2021-09-22 09:50:11.0 -0400
+++ pairtools-0.3.0/debian/patches/series	2021-11-21 16:13:08.0 -0400
@@ -1,3 +1,4 @@
 makefile
 fix-spelling
 tests-to-python3
+python-3.10

Bug#1000337: pairtools: FTBFS with Python 3.10

2021-11-21 Thread Stefano Rivera

Source: pairtools
Version: 0.3.0-3
Severity: serious
Tags: upstream patch
Justification: FTBFS
Forwarded: https://github.com/open2c/pairtools/pull/108

pairtools FTBFS with Python 3.10:
==
ERROR: pairtools (unittest.loader._FailedTest)
--
ImportError: Failed to import test module: pairtools
Traceback (most recent call last):
  File "/usr/lib/python3.10/unittest/loader.py", line 470, in _find_test_path
package = self._get_module_from_name(name)
  File "/usr/lib/python3.10/unittest/loader.py", line 377, in 
_get_module_from_name
__import__(name)
  File "/<>/.pybuild/cpython3_3.10/build/pairtools/__init__.py", 
line 116, in 
from .pairtools_dedup import dedup
  File 
"/<>/.pybuild/cpython3_3.10/build/pairtools/pairtools_dedup.py", 
line 14, in 
from .pairtools_stats import PairCounter
  File 
"/<>/.pybuild/cpython3_3.10/build/pairtools/pairtools_stats.py", 
line 10, in 
from collections import OrderedDict, Mapping
ImportError: cannot import name 'Mapping' from 'collections' 
(/usr/lib/python3.10/collections/__init__.py)


--
Ran 1 test in 0.000s


See: 
https://buildd.debian.org/status/fetch.php?pkg=pairtools=amd64=0.3.0-3%2Bb1=1637486558=0

I'll file an NMU, shortly.

SR

Bug#1000336: numba: FTBFS with Python 3.10

2021-11-21 Thread Stefano Rivera

Source: numba
Version: 0.52.0-5
Severity: serious
Tags: ftbfs upstream
Justification: FTBFS
Forwarded: https://github.com/numba/numba/issues/7562

numba isn't compatible with Python 3.10, yet.
Upstream is working on it, see https://github.com/numba/numba/issues/7562

setup.py immediately fails with:
RuntimeError: Cannot install on Python version 3.10.0; only versions 
>=3.6,<3.10 are supported.

See e.g. 
https://buildd.debian.org/status/fetch.php?pkg=numba=amd64=0.52.0-5%2Bb1=1637478629=0

SR

Bug#997448: mlpy: diff for NMU version 3.5.0+ds-1.3

2021-11-21 Thread Stefano Rivera

Control: tags 997448 + patch

Dear maintainer,

I've prepared an NMU for mlpy (versioned as 3.5.0+ds-1.3). The diff
is attached to this message.

Also forwarded as https://salsa.debian.org/science-team/mlpy/-/merge_requests/3

Regards,

SR
diff -Nru mlpy-3.5.0+ds/debian/changelog mlpy-3.5.0+ds/debian/changelog
--- mlpy-3.5.0+ds/debian/changelog	2020-06-12 10:20:54.0 -0400
+++ mlpy-3.5.0+ds/debian/changelog	2021-11-21 10:46:25.0 -0400
@@ -1,3 +1,10 @@
+mlpy (3.5.0+ds-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add Build-Dependency on tex-gyre, for docs (Closes: #997448)
+
+ -- Stefano Rivera   Sun, 21 Nov 2021 10:46:25 -0400
+
 mlpy (3.5.0+ds-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru mlpy-3.5.0+ds/debian/control mlpy-3.5.0+ds/debian/control
--- mlpy-3.5.0+ds/debian/control	2020-06-12 10:20:54.0 -0400
+++ mlpy-3.5.0+ds/debian/control	2021-11-21 10:46:25.0 -0400
@@ -13,6 +13,7 @@
python3-numpy,
python3-sphinx,
python3-scipy ,
+   tex-gyre,
texlive,
texlive-latex-extra,
latexmk,

Bug#1000317: cyvcf2: diff for NMU version 0.30.11-1.1

2021-11-21 Thread Stefano Rivera

Dear maintainer,

I've prepared an NMU for cyvcf2 (versioned as 0.30.11-1.1). The diff
is attached to this message.

Also filed as https://salsa.debian.org/med-team/cyvcf2/-/merge_requests/1

Regards,

SR
diff -Nru cyvcf2-0.30.11/debian/changelog cyvcf2-0.30.11/debian/changelog
--- cyvcf2-0.30.11/debian/changelog	2021-08-15 07:35:52.0 -0400
+++ cyvcf2-0.30.11/debian/changelog	2021-11-21 08:38:57.0 -0400
@@ -1,3 +1,11 @@
+cyvcf2 (0.30.11-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Python 3.10 support - avoid a regression in gzip file handles
+(Closes: #1000317)
+
+ -- Stefano Rivera   Sun, 21 Nov 2021 08:38:57 -0400
+
 cyvcf2 (0.30.11-1) unstable; urgency=medium
 
   * Fix watch URL
diff -Nru cyvcf2-0.30.11/debian/patches/python-3.10.patch cyvcf2-0.30.11/debian/patches/python-3.10.patch
--- cyvcf2-0.30.11/debian/patches/python-3.10.patch	1969-12-31 20:00:00.0 -0400
+++ cyvcf2-0.30.11/debian/patches/python-3.10.patch	2021-11-21 08:38:57.0 -0400
@@ -0,0 +1,46 @@
+From: Stefano Rivera 
+Date: Sun, 21 Nov 2021 08:29:40 -0400
+Subject: Avoid a Python 3.10 regression in iterating GzipFiles
+
+Open the file with a context manager, so we're holding onto a reference to it, for the lifetime of the iteration.
+
+This avoids hitting https://bugs.python.org/issue45475 which affects python3.10 3.10.0-4 in Debian.
+
+Bug-Debian: https://bugs.debian.org/1000317
+Forwarded: https://github.com/brentp/cyvcf2/pull/225
+---
+ cyvcf2/tests/test_reader.py | 21 +++--
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/cyvcf2/tests/test_reader.py b/cyvcf2/tests/test_reader.py
+index 76cb9f8..f81b920 100644
+--- a/cyvcf2/tests/test_reader.py
 b/cyvcf2/tests/test_reader.py
+@@ -456,16 +456,17 @@ def test_var_type():
+ def _get_line_for(v):
+ import gzip
+ 
+-for i, line in enumerate(gzip.open(VCF_PATH), start=1):
+-line = line.decode()
+-if line[0] == "#": continue
+-toks = line.strip().split("\t")
+-if not (toks[0] == v.CHROM and int(toks[1]) == v.POS): continue
+-if toks[3] != v.REF: continue
+-if toks[4] not in v.ALT: continue
+-return toks
+-else:
+-raise Exception("not found")
++with gzip.open(VCF_PATH) as f:
++for i, line in enumerate(f, start=1):
++line = line.decode()
++if line[0] == "#": continue
++toks = line.strip().split("\t")
++if not (toks[0] == v.CHROM and int(toks[1]) == v.POS): continue
++if toks[3] != v.REF: continue
++if toks[4] not in v.ALT: continue
++return toks
++else:
++raise Exception("not found")
+ 
+ 
+ def _get_samples(v):
diff -Nru cyvcf2-0.30.11/debian/patches/series cyvcf2-0.30.11/debian/patches/series
--- cyvcf2-0.30.11/debian/patches/series	2021-08-08 07:32:31.0 -0400
+++ cyvcf2-0.30.11/debian/patches/series	2021-11-21 08:38:57.0 -0400
@@ -1,2 +1,3 @@
 add_htslib_link_dependency.patch
 i386.patch
+python-3.10.patch

Bug#1000317: cyvcf2: FTBFS with Python 3.10

2021-11-21 Thread Stefano Rivera

Source: cyvcf2
Version: 0.30.11-1
Severity: serious
Tags: ftbfs patch
Justification: FTBFS

https://buildd.debian.org/status/fetch.php?pkg=cyvcf2=amd64=0.30.11-1%2Bb1=1637483151=0

Tests fail with:
==
ERROR: cyvcf2.tests.test_reader.test_info_dict
--
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/nose/case.py", line 197, in runTest
self.test(*self.arg)
  File 
"/<>/.pybuild/cpython3_3.10_cyvcf2/build/cyvcf2/tests/test_reader.py",
 line 226, in test_info_dict
toks = _get_line_for(variant)
  File 
"/<>/.pybuild/cpython3_3.10_cyvcf2/build/cyvcf2/tests/test_reader.py",
 line 459, in _get_line_for
for i, line in enumerate(gzip.open(VCF_PATH), start=1):
ValueError: readline of closed file

==
ERROR: cyvcf2.tests.test_reader.test_gt_types
--
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/nose/case.py", line 197, in runTest
self.test(*self.arg)
  File 
"/<>/.pybuild/cpython3_3.10_cyvcf2/build/cyvcf2/tests/test_reader.py",
 line 518, in test_gt_types
o = _get_samples(variant)
  File 
"/<>/.pybuild/cpython3_3.10_cyvcf2/build/cyvcf2/tests/test_reader.py",
 line 485, in _get_samples
toks = _get_line_for(v)
  File 
"/<>/.pybuild/cpython3_3.10_cyvcf2/build/cyvcf2/tests/test_reader.py",
 line 459, in _get_line_for
for i, line in enumerate(gzip.open(VCF_PATH), start=1):
ValueError: readline of closed file

--
Ran 95 tests in 0.647s

Should be resolved by applying this patch: 
https://github.com/brentp/cyvcf2/pull/225

I'll do a 0-day NMU for it.

SR

Bug#1000315: compreffor: diff for NMU version 0.5.1-1.1

2021-11-21 Thread Stefano Rivera

Control: tags 1000315 + patch
Control: tags 1000315 + pending

Dear maintainer,

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

Also filed as an MR: 
https://salsa.debian.org/fonts-team/compreffor/-/merge_requests/1

Regards,

SR
diff -Nru compreffor-0.5.1/debian/changelog compreffor-0.5.1/debian/changelog
--- compreffor-0.5.1/debian/changelog	2021-01-07 11:16:12.0 -0400
+++ compreffor-0.5.1/debian/changelog	2021-11-21 08:20:06.0 -0400
@@ -1,3 +1,10 @@
+compreffor (0.5.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Update collections.abc imports for Python 3.10 (Closes: #1000315)
+
+ -- Stefano Rivera   Sun, 21 Nov 2021 08:20:06 -0400
+
 compreffor (0.5.1-1) unstable; urgency=medium
 
   * Team upload
diff -Nru compreffor-0.5.1/debian/patches/python-3.10.patch compreffor-0.5.1/debian/patches/python-3.10.patch
--- compreffor-0.5.1/debian/patches/python-3.10.patch	1969-12-31 20:00:00.0 -0400
+++ compreffor-0.5.1/debian/patches/python-3.10.patch	2021-11-21 08:20:06.0 -0400
@@ -0,0 +1,27 @@
+From: Hugo van Kemenade 
+Date: Fri, 7 May 2021 20:41:49 +0300
+Subject: Fix collections.abc import for Python 3.9 (#142)
+
+Origin: upstream, https://github.com/googlefonts/compreffor/pull/142
+Bug-Debian: https://bugs.debian.org/1000315
+---
+ src/python/compreffor/test/dummy.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/python/compreffor/test/dummy.py b/src/python/compreffor/test/dummy.py
+index 483f1cf..72e5c3c 100644
+--- a/src/python/compreffor/test/dummy.py
 b/src/python/compreffor/test/dummy.py
+@@ -13,9 +13,10 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-import collections
++import collections.abc
+ 
+-class DummyGlyphSet(collections.MutableMapping):
++
++class DummyGlyphSet(collections.abc.MutableMapping):
+ """Behaves like a glyphset for testing purposes"""
+ 
+ def __init__(self, *args, **kwargs):
diff -Nru compreffor-0.5.1/debian/patches/series compreffor-0.5.1/debian/patches/series
--- compreffor-0.5.1/debian/patches/series	1969-12-31 20:00:00.0 -0400
+++ compreffor-0.5.1/debian/patches/series	2021-11-21 08:20:06.0 -0400
@@ -0,0 +1 @@
+python-3.10.patch

Bug#1000315: compreffor: FTBFS with Python 3.10

2021-11-21 Thread Stefano Rivera

Source: compreffor
Version: 0.5.1-1
Severity: serious
Tags: ftbfs

https://buildd.debian.org/status/fetch.php?pkg=compreffor=amd64=0.5.1-1%2Bb1=1637495198=0

Tests fail with:
 ERRORS 
_ ERROR collecting 
.pybuild/cpython3_3.10_compreffor/build/compreffor/test/dummy.py _
compreffor/test/dummy.py:18: in 
class DummyGlyphSet(collections.MutableMapping):
E   AttributeError: module 'collections' has no attribute 'MutableMapping'
_ ERROR collecting 
.pybuild/cpython3_3.10_compreffor/build/compreffor/test/pyCompressor_test.py _
compreffor/test/pyCompressor_test.py:19: in 
from compreffor.test.dummy import DummyGlyphSet
compreffor/test/dummy.py:18: in 
class DummyGlyphSet(collections.MutableMapping):
E   AttributeError: module 'collections' has no attribute 'MutableMapping'
_ ERROR collecting 
.pybuild/cpython3_3.10_compreffor/build/compreffor/test/pyCompressor_test.py _
compreffor/test/pyCompressor_test.py:19: in 
from compreffor.test.dummy import DummyGlyphSet
compreffor/test/dummy.py:18: in 
class DummyGlyphSet(collections.MutableMapping):
E   AttributeError: module 'collections' has no attribute 'MutableMapping'

The fix should be as simple as:
https://github.com/googlefonts/compreffor/commit/1ddd8416cd2e998d783def2ba392cea9c9fce346

I'll file an NMU momentarily.

SR

Bug#999538: pytables: diff for NMU version 3.6.1-5.1

2021-11-20 Thread Stefano Rivera

Control: tags 999538 + patch
Control: tags 999538 + pending

Dear maintainer,

I've prepared an NMU for pytables (versioned as 3.6.1-5.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Also available as an MR: 
https://salsa.debian.org/science-team/pytables/-/merge_requests/1

Regards,

SR
diff -Nru pytables-3.6.1/debian/changelog pytables-3.6.1/debian/changelog
--- pytables-3.6.1/debian/changelog	2021-09-28 02:05:13.0 -0400
+++ pytables-3.6.1/debian/changelog	2021-11-20 23:32:58.0 -0400
@@ -1,3 +1,12 @@
+pytables (3.6.1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Fix FTBFS with numpy >= 1.20 (Closes: #999538)
+  * Patch: Fix FTBFS with Python 3.10.
+  * Install Python 3.10 C Extensions (2-digit minor version).
+
+ -- Stefano Rivera   Sat, 20 Nov 2021 23:32:58 -0400
+
 pytables (3.6.1-5) unstable; urgency=medium
 
   * debian/control:
diff -Nru pytables-3.6.1/debian/patches/0010-Use-lowercase-float-int-as-numpy-dtype.patch pytables-3.6.1/debian/patches/0010-Use-lowercase-float-int-as-numpy-dtype.patch
--- pytables-3.6.1/debian/patches/0010-Use-lowercase-float-int-as-numpy-dtype.patch	1969-12-31 20:00:00.0 -0400
+++ pytables-3.6.1/debian/patches/0010-Use-lowercase-float-int-as-numpy-dtype.patch	2021-11-20 23:32:58.0 -0400
@@ -0,0 +1,176 @@
+From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= 
+Date: Sun, 24 Jan 2021 16:36:21 +0100
+Subject: Use lowercase float/int as numpy dtype
+
+Float64 is gone with numpy 1.20, which causes doctests to fail
+(https://bugzilla.redhat.com/show_bug.cgi?id=1914335).
+
+Similarly all uses of Float32, Int32 should be replaced by float32 and int32.
+
+>>> numpy.__version__
+'1.19.4'
+>>> [k for k in numpy.sctypeDict.keys() if str(k).lower().startswith('float')]
+['float16', 'Float16', 'float32', 'Float32', 'float64', 'Float64', 'float128', 'Float128', 'float_', 'float']
+
+>>> numpy.__version__
+'1.20.0rc2'
+>>> [k for k in numpy.sctypeDict.keys() if str(k).lower().startswith('float')]
+['float16', 'float32', 'float64', 'float128', 'float_', 'float']
+
+Bug-Upstream: https://github.com/PyTables/PyTables/issues/875
+Bug-Debian: https://bugs.debian.org/999538
+Origin: upstream, https://github.com/PyTables/PyTables/pull/862
+---
+ bench/bsddb-table-bench.py | 10 +-
+ bench/postgres-search-bench.py |  4 ++--
+ bench/pytables-search-bench.py |  6 +++---
+ bench/recarray2-test.py|  2 +-
+ bench/shelve-bench.py  | 10 +-
+ bench/sqlite-search-bench.py   |  4 ++--
+ tables/atom.py |  2 +-
+ 7 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/bench/bsddb-table-bench.py b/bench/bsddb-table-bench.py
+index dd9f875..a2e0236 100644
+--- a/bench/bsddb-table-bench.py
 b/bench/bsddb-table-bench.py
+@@ -83,11 +83,11 @@ def createFile(filename, totalrows, recsize, verbose):
+ # Get the record object associated with the new table
+ if recsize == "big":
+ isrec = Big()
+-arr = np.array(np.arange(32), type=np.Float64)
+-arr2 = np.array(np.arange(32), type=np.Float64)
++arr = np.array(np.arange(32), type=np.float64)
++arr2 = np.array(np.arange(32), type=np.float64)
+ elif recsize == "medium":
+ isrec = Medium()
+-arr = np.array(np.arange(2), type=np.Float64)
++arr = np.array(np.arange(2), type=np.float64)
+ else:
+ isrec = Small()
+ # print d
+@@ -107,8 +107,8 @@ def createFile(filename, totalrows, recsize, verbose):
+ #d['TDCcount'] = i % 256
+ d['ADCcount'] = (i * 256) % (1 << 16)
+ if recsize == "big":
+-#d.float1 = np.array([i]*32, np.Float64)
+-#d.float2 = np.array([i**2]*32, np.Float64)
++#d.float1 = np.array([i]*32, np.float64)
++#d.float2 = np.array([i**2]*32, np.float64)
+ arr[0] = 1.1
+ d['float1'] = arr
+ arr2[0] = 2.2
+diff --git a/bench/postgres-search-bench.py b/bench/postgres-search-bench.py
+index d2c9f4f..7fe83f6 100644
+--- a/bench/postgres-search-bench.py
 b/bench/postgres-search-bench.py
+@@ -15,11 +15,11 @@ def flatten(l):
+ 
+ 
+ def fill_arrays(start, stop):
+-col_i = numpy.arange(start, stop, type=numpy.Int32)
++col_i = numpy.arange(start, stop, type=numpy.int32)
+ if userandom:
+ col_j = numpy.random.uniform(0, nrows, size=[stop - start])
+ else:
+-col_j = numpy.array(col_i, type=numpy.Float64)
++col_j = numpy.array(col_i, type=numpy.float64)
+ return col_i, col_j
+ 
+ # Generator for ensure pytables benchmark compatibility
+diff --git a/bench/pytables-search-bench.py b/bench/pytables-search-bench.py
+index 726d30b..6417186 100644
+--- a/bench/pytables-search-bench.py
 b/bench/pytables-search-bench.py
+@@ -37,11 +37,11 @@ def create_db(

Bug#1000279: FTBFS: CMake Error: Unknown argument --enable-perl

2021-11-20 Thread Stefano Rivera

Source: openscap
Version: 1.3.4-1
Severity: important
Tags: ftbfs

In the Python 3.10 binNMUs, openscap FTBFS with:

   debian/rules override_dh_auto_configure
make[1]: Entering directory '/<>'
dh_auto_configure -Bbuild-python-3.10 -- --enable-sce --enable-perl 
-DPERL_VERSION=5.32 PYTHON=/usr/bin/python3.10
install -d build-python-3.10
cd build-python-3.10 && cmake -DCMAKE_INSTALL_PREFIX=/usr 
-DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc 
-DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON 
-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF 
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_RUNSTATEDIR=/run 
"-GUnix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON 
-DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu --enable-sce --enable-perl 
-DPERL_VERSION=5.32 PYTHON=/usr/bin/python3.10 ..
CMake Error: Unknown argument --enable-perl
CMake Error: Run 'cmake --help' for all supported options.
dh_auto_configure: error: cd build-python-3.10 && cmake 
-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None 
-DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var 
-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF 
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_RUNSTATEDIR=/run 
"-GUnix Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON 
-DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu --enable-sce --enable-perl 
-DPERL_VERSION=5.32 PYTHON=/usr/bin/python3.10 .. returned exit code 1

Full log attached.

Removing --enable-sce --enable-perl seems to work (and it reports the
features as enabled), but I don't know CMake well enough to know what's
going on here.

SR
sbuild (Debian sbuild) 0.81.2 (31 January 2021) on haydn.kardiogramm.net

+==+
| openscap (amd64) Sat, 20 Nov 2021 19:56:42 + |
+==+

Package: openscap
Distribution: unstable
Machine Architecture: amd64
Host Architecture: amd64
Build Architecture: amd64
Build Type: binary

WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
I: NOTICE: Log filtering will replace 'autopkgtest-virt-dummy-location' with 
'<>'
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
confinement
I: NOTICE: Log filtering will replace 'build/openscap-GPUfdK/resolver-WSkP11' 
with '<>'

+--+
| Update chroot|
+--+

WARNING: cgroup v2 is not fully supported yet,

Bug#999397: siphashc: diff for NMU version 2.1-0.1

2021-11-20 Thread Stefano Rivera

Control: tags 999397 + patch

Dear maintainer,

I've prepared an NMU for siphashc (versioned as 2.1-0.1). The diff
is attached to this message.

Regards.

SR
diff -Nru siphashc-1.2/appveyor.yml siphashc-2.1/appveyor.yml
--- siphashc-1.2/appveyor.yml	2018-10-04 06:47:17.0 -0400
+++ siphashc-2.1/appveyor.yml	1969-12-31 20:00:00.0 -0400
@@ -1,33 +0,0 @@
-version: "{build}"
-
-clone_depth: 100
-
-environment:
-  matrix:
-- PYTHON: "C:\\Python27"
-- PYTHON: "C:\\Python33"
-- PYTHON: "C:\\Python34"
-- PYTHON: "C:\\Python35"
-- PYTHON: "C:\\Python36"
-- PYTHON: "C:\\Python36-x64"
-
-install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  # We need wheel installed to build wheels
-  - "python.exe -m pip install wheel"
-
-build_script:
-  # Build the compiled extension
-  - "python setup.py build"
-
-test_script:
-  # Run the project tests
-- "python setup.py test"
-- "python benchmark.py"
-
-after_test:
-  - "python.exe setup.py bdist_wheel"
-
-artifacts:
-  # bdist_wheel puts your built wheel in the dist directory
-  - path: dist\*
diff -Nru siphashc-1.2/benchmark.py siphashc-2.1/benchmark.py
--- siphashc-1.2/benchmark.py	2018-10-04 06:47:17.0 -0400
+++ siphashc-2.1/benchmark.py	2020-09-02 04:05:03.0 -0400
@@ -1,17 +1,17 @@
 #!/usr/bin/env python
-"""Simple timing benchmark.
+"""
+Simple timing benchmark.
+
+Used for testing possible regressions when changing code.
+"""
 
-Used for testing possible regressions when changing code."""
-from __future__ import print_function
 import timeit
 
-print('Benchmark (short):')
-print(timeit.timeit(
-"siphash('0123456789ABCDEF', 'a')",
-"from siphashc import siphash"
-))
-print('Benchmark (long):')
-print(timeit.timeit(
-"siphash('0123456789ABCDEF', 'a' * 1000)",
-"from siphashc import siphash"
-))
+print("Benchmark (short):")
+print(timeit.timeit("siphash('0123456789ABCDEF', 'a')", "from siphashc import siphash"))
+print("Benchmark (long):")
+print(
+timeit.timeit(
+"siphash('0123456789ABCDEF', 'a' * 1000)", "from siphashc import siphash"
+)
+)
diff -Nru siphashc-1.2/CHANGES.rst siphashc-2.1/CHANGES.rst
--- siphashc-1.2/CHANGES.rst	2018-10-04 06:47:17.0 -0400
+++ siphashc-2.1/CHANGES.rst	2020-09-02 04:05:03.0 -0400
@@ -1,6 +1,22 @@
 Changes
 ===
 
+2.1
+---
+
+* Fixed publishing wheels in pypi.org.
+
+2.0
+---
+
+* Dropped support for Python 2.
+
+1.3
+---
+
+* Changed license to ISC.
+* Fixed depreciation warning on Python 3.8.
+
 1.2
 ---
 
diff -Nru siphashc-1.2/debian/changelog siphashc-2.1/debian/changelog
--- siphashc-1.2/debian/changelog	2019-01-25 13:02:55.0 -0400
+++ siphashc-2.1/debian/changelog	2021-11-20 09:10:26.0 -0400
@@ -1,3 +1,11 @@
+siphashc (2.1-0.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release.
+  * Add watch file.
+
+ -- Stefano Rivera   Sat, 20 Nov 2021 09:10:26 -0400
+
 siphashc (1.2-1) unstable; urgency=medium
 
   * Initial release (Closes: #892182)
diff -Nru siphashc-1.2/debian/watch siphashc-2.1/debian/watch
--- siphashc-1.2/debian/watch	1969-12-31 20:00:00.0 -0400
+++ siphashc-2.1/debian/watch	2021-11-20 09:08:43.0 -0400
@@ -0,0 +1,4 @@
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \
+ https://github.com/WeblateOrg/siphashc/tags \
+ (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
diff -Nru siphashc-1.2/.github/dependabot.yml siphashc-2.1/.github/dependabot.yml
--- siphashc-1.2/.github/dependabot.yml	1969-12-31 20:00:00.0 -0400
+++ siphashc-2.1/.github/dependabot.yml	2020-09-02 04:05:03.0 -0400
@@ -0,0 +1,17 @@
+# This file is generated in https://github.com/WeblateOrg/meta/
+version: 2
+updates:
+  - package-ecosystem: github-actions
+directory: /
+schedule:
+  interval: daily
+labels:
+  - dependencies
+  - automerge
+  - package-ecosystem: pip
+directory: /
+schedule:
+  interval: daily
+labels:
+  - dependencies
+  - automerge
diff -Nru siphashc-1.2/.github/FUNDING.yml siphashc-2.1/.github/FUNDING.yml
--- siphashc-1.2/.github/FUNDING.yml	1969-12-31 20:00:00.0 -0400
+++ siphashc-2.1/.github/FUNDING.yml	2020-09-02 04:05:03.0 -0400
@@ -0,0 +1,4 @@
+# This file is maintained in https://github.com/WeblateOrg/meta/
+github: [nijel]
+custom: https://weblate.org/donate/
+liberapay: Weblate
diff -Nru siphashc-1.2/.github/.kodiak.toml siphashc-2.1/.github/.kodiak.toml
--- siphashc-1.2/.github/.kodiak.toml	1969-12-31 20:00:00.0 -0400
+++ siphashc-2.1/.github/.kodiak.toml	2020-09-02 04:05:03.0 -0400
@@ -0,0 +1,9 @@
+# This file is maintained in https:/

Bug#999381: python-pairix: diff for NMU version 0.3.7-4.1

2021-11-19 Thread Stefano Rivera

Control: tags 999381 + patch

Dear maintainer,

I've prepared an NMU for python-pairix (versioned as 0.3.7-4.1). The diff
is attached to this message.

Regards.

SR
diff -Nru python-pairix-0.3.7/debian/changelog python-pairix-0.3.7/debian/changelog
--- python-pairix-0.3.7/debian/changelog	2021-10-01 10:07:39.0 -0400
+++ python-pairix-0.3.7/debian/changelog	2021-11-19 22:21:23.0 -0400
@@ -1,3 +1,10 @@
+python-pairix (0.3.7-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Avoid tests failing under Python 3.10. (Closes: #999381)
+
+ -- Stefano Rivera   Fri, 19 Nov 2021 22:21:23 -0400
+
 python-pairix (0.3.7-4) unstable; urgency=medium
 
   * Fix watchfile to detect new versions on github
diff -Nru python-pairix-0.3.7/debian/patches/python3.10 python-pairix-0.3.7/debian/patches/python3.10
--- python-pairix-0.3.7/debian/patches/python3.10	1969-12-31 20:00:00.0 -0400
+++ python-pairix-0.3.7/debian/patches/python3.10	2021-11-19 22:21:10.0 -0400
@@ -0,0 +1,330 @@
+Description: Avoid a Python3.10 regression in iterating GzipFiles
+ Open the file with a context manager, so we're holding onto a reference to it,
+ for the lifetime of the iteration.
+ This avoids hitting https://bugs.python.org/issue45475 which affects
+ python3.10 3.10.0-4 in Debian.
+
+Bug-Debian: https://bugs.debian.org/999381
+Bug-cpython: https://bugs.python.org/issue45475
+Forwarded: https://github.com/4dn-dcic/pairix/pull/71
+Author: Stefano Rivera 
+--- a/test/test_oldindex.py
 b/test/test_oldindex.py
+@@ -36,45 +36,48 @@
+ def get_header(filename, meta_char='#'):
+ """Read gzipped file and retrieve lines beginning with '#'."""
+ retval = []
+-for line in gzip.open(filename):
+-try:
+-line = line.decode('utf-8')
+-except AttributeError:
+-pass
+-if line.startswith(meta_char):
+-retval.append(line.rstrip())
++with gzip.open(filename) as f:
++for line in f:
++try:
++line = line.decode('utf-8')
++except AttributeError:
++pass
++if line.startswith(meta_char):
++retval.append(line.rstrip())
+ return retval
+ 
+ 
+ def get_chromsize(filename):
+ """Read gzipped file and retrieve chromsize."""
+ retval = []
+-for line in gzip.open(filename):
+-try:
+-line = line.decode('utf-8')
+-except AttributeError:
+-pass
+-if line.startswith('#chromsize: '):
+-fields = line.rstrip().split('\s+')
+-chrname = fields[1]
+-chrsize = fields[2]
+-retval.append([chrname, chrsize])
++with gzip.open(filename) as f:
++for line in f:
++try:
++line = line.decode('utf-8')
++except AttributeError:
++pass
++if line.startswith('#chromsize: '):
++fields = line.rstrip().split('\s+')
++chrname = fields[1]
++chrsize = fields[2]
++retval.append([chrname, chrsize])
+ return retval
+ 
+ 
+ def read_vcf(filename):
+ """Read a VCF file and return a list of [chrom, start, end] items."""
+ retval = []
+-for line in gzip.open(filename):
+-try:
+-line = line.decode('utf-8')
+-except AttributeError:
+-pass
+-fields = line.rstrip().split('\t')
+-chrom = fields[0]
+-start = fields[1]
+-end = fields[1]
+-retval.append([chrom, start, end])
++with gzip.open(filename) as f:
++for line in f:
++try:
++line = line.decode('utf-8')
++except AttributeError:
++pass
++fields = line.rstrip().split('\t')
++chrom = fields[0]
++start = fields[1]
++end = fields[1]
++retval.append([chrom, start, end])
+ return retval
+ 
+ 
+@@ -83,20 +86,21 @@
+ or undetermined. Do this by testing string values of """
+ is_juicer = False
+ is_4DN = False
+-for line in gzip.open(filename):
+-try:
+-line = line.decode('utf-8')
+-except AttributeError:
+-pass
+-fields = line.rstrip().split(delimiter)
+-if len(fields)>=6 and is_str(fields[2]) and is_str(fields[6]):
+-is_juicer = True
+-if is_str(fields[2]) and is_str(fields[4]):
+-is_4DN = True
+-if not is_juicer and is_4DN:
+-return '4DN'
+-elif is_juicer:
+-return 'juicer'
++with gzip.open(filename) as f:
++for line in f:
++try:
++line = line.decode('utf-8')
++except AttributeError:
++pass
++fields = line.rstrip().split(delimiter)
++

Bug#999381: python-pairix ftbfs with Python 3.10 (test failures)

2021-11-19 Thread Stefano Rivera

Control: affects -1 python3.10

Hi Matthias (2021.11.10_11:31:16_-0400)

This looks like fallout from https://bugs.python.org/issue45475, a
Python 3.10 regression.

python-pairix is easily patched to avoid hitting the bug, though.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#997719: libvirt-python: FTBFS: ERROR: failed virDomainGetMessages

2021-11-18 Thread Stefano Rivera

Hi Lucas (2021.10.24_07:40:18_-0400)

Looks like a mismatch between libvirt-python and libvirt itself, that
would be resolved by upgrading it to version 7.6.0 (or later).

SR

Bug#997363: libtorrent-rasterbar: FTBFS: configure: error: *** A compiler with support for C++17 language features is required.

2021-11-18 Thread Stefano Rivera

Presumably resolved in 2.0.0 in NEW, that doesn't use autoconf any more.

SR

Bug#999691: reprotest: Version check in debian/rules breaks down-stream distro versioning

2021-11-14 Thread Stefano Rivera

Source: reprotest
Version: 0.7.18
Severity: normal
Tags: patch

Adding a suffix is pretty common in a downstream distro. For example,
Ubuntu adds ubuntu1 when modifying a package, or build1 when doing a
no-change upload (Ubuntu doesn't have binNMUs).

Is the expectation that setup.py should have it's version updated in
this situation? I assume not from the + check, which would exclude
Debian NMUs and binNMUs.

Maybe just check the numeric bit? e.g.
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ export PYBUILD_NAME = reprotest
 export REPROTEST_TEST_DONTVARY = fileordering,user_group,domain_host$(if 
$(shell nproc | grep --color=no -Fx 1),$(,)num_cpus,)

 override_dh_auto_configure:
-   test $$(python3 setup.py --version) = $$(echo $(DEB_VERSION) | cut -f1 
-d'+')
+   test $$(python3 setup.py --version) = $$(echo $(DEB_VERSION) | sed 
's/[^0-9.].*//')
dh_auto_configure

 override_dh_auto_build:

SR

Bug#999689: reprotest: autopkgtest missing dependency on diffoscope

2021-11-14 Thread Stefano Rivera

Source: reprotest
Version: 0.7.17
Severity: normal
Tags: patch

Fixing #988964 broke the "not need_builddeps" autopkgtest:
https://ci.debian.net/packages/r/reprotest/unstable/amd64/

It has failed since 0.7.16.

The easy fix is:
diff --git a/debian/tests/control b/debian/tests/control
index 8132bdc..e5a47b8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Test-Command: debian/rules autopkgtest-pytest PYTEST_MARKEXPR="not 
need_builddeps"
-Depends: @, python3-pytest, faketime, locales-all, fakeroot
+Depends: @, diffoscope, python3-pytest, faketime, locales-all, fakeroot
 
 Test-Command: debian/rules autopkgtest-pytest PYTEST_MARKEXPR="need_builddeps"
 Depends: @, @builddeps@, fakeroot

SR

Bug#998625: python-spinners: diff for NMU version 0.0~git20200220.a73d561-1.1

2021-11-05 Thread Stefano Rivera

Control: tags 998625 + pending

Dear maintainer,

I've prepared an NMU for python-spinners (versioned as 
0.0~git20200220.a73d561-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

SR
diff -Nru python-spinners-0.0~git20200220.a73d561/debian/changelog python-spinners-0.0~git20200220.a73d561/debian/changelog
--- python-spinners-0.0~git20200220.a73d561/debian/changelog	2021-08-23 21:18:47.0 -0700
+++ python-spinners-0.0~git20200220.a73d561/debian/changelog	2021-11-05 12:13:21.0 -0700
@@ -1,3 +1,12 @@
+python-spinners (0.0~git20200220.a73d561-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop tox Build-Dep, we're doing build-time tests without it, fixes FTBFS
+with dh-python >= 5.20211105. (Closes: #998625)
+  * Add missing Build-Depends on python3-setuptools.
+
+ -- Stefano Rivera   Fri, 05 Nov 2021 12:13:21 -0700
+
 python-spinners (0.0~git20200220.a73d561-1) unstable; urgency=low
 
   * Initial release. (Closes: #992992)
diff -Nru python-spinners-0.0~git20200220.a73d561/debian/control python-spinners-0.0~git20200220.a73d561/debian/control
--- python-spinners-0.0~git20200220.a73d561/debian/control	2021-08-23 21:18:47.0 -0700
+++ python-spinners-0.0~git20200220.a73d561/debian/control	2021-11-05 01:10:31.0 -0700
@@ -7,7 +7,7 @@
 	python3-all,
 	python3-coverage,
 	python3-nose,
-	tox
+	python3-setuptools,
 Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: https://github.com/manrajgrover/py-spinners

Bug#998623: pysha3: diff for NMU version 1.0.2-4.2

2021-11-05 Thread Stefano Rivera

Control: tags 998623 + pending

Dear maintainer,

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

Regards.

SR
diff -Nru pysha3-1.0.2/debian/changelog pysha3-1.0.2/debian/changelog
--- pysha3-1.0.2/debian/changelog	2020-03-28 13:18:51.0 -0700
+++ pysha3-1.0.2/debian/changelog	2021-11-05 12:14:01.0 -0700
@@ -1,3 +1,11 @@
+pysha3 (1.0.2-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop tox Build-Dep, we're doing build-time tests without it, fixes FTBFS
+with dh-python >= 5.20211105 (Closes: #998623).
+
+ -- Stefano Rivera   Fri, 05 Nov 2021 12:14:01 -0700
+
 pysha3 (1.0.2-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru pysha3-1.0.2/debian/control pysha3-1.0.2/debian/control
--- pysha3-1.0.2/debian/control	2020-01-19 01:43:49.0 -0800
+++ pysha3-1.0.2/debian/control	2021-11-05 00:54:52.0 -0700
@@ -3,7 +3,6 @@
 Section: python
 Priority: optional
 Build-Depends:
-tox,
 python3-flake8,
 python3-setuptools,
 dh-python,

Bug#998625: python-spinners: FTBFS with dh-python 5.20211105 due to missing dependencies

2021-11-05 Thread Stefano Rivera

Source: python-spinners
Version: 0.0~git20200220.a73d561-1
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source

dh-python 5.20211105 fixed tox detection based on Build-Depends, which
causes it to try to run tox tests on python-deprecated.
This fails because the tox.ini specifies dependencies that aren't met
(they're far too tightly pinned for Debian):

   dh_auto_test -O--buildsystem=pybuild
I: pybuild base:237: cd 
'/<>/.pybuild/cpython3_3.9_py-spinners/build'; tox -c 
'/<>'/tox.ini --sitepackages -e py39
GLOB sdist-make: /<>/setup.py
py39 create: /<>/.tox/py39
py39 installdeps: -r/<>/requirements-dev.txt
WARNING: Discarding $PYTHONPATH from environment, to override specify 
PYTHONPATH in 'passenv' in your configuration.
ERROR: invocation failed (exit code 1), logfile: 
/<>/.tox/py39/log/py39-1.log
== log start ===
WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
ERROR: Could not find a version that satisfies the requirement coverage==4.4.1
ERROR: No matching distribution found for coverage==4.4.1

=== log end 
ERROR: could not install deps [-r/<>/requirements-dev.txt]; v = 
InvocationError("'/<>/.tox/py39/bin/python' -m pip install 
'-r/<>/requirements-dev.txt'", 1)
___ summary 
ERROR:   py39: could not install deps 
[-r/<>/requirements-dev.txt]; v = 
InvocationError("'/<>/.tox/py39/bin/python' -m pip install 
'-r/<>/requirements-dev.txt'", 1)
E: pybuild pybuild:354: test: plugin distutils failed with: exit code=1: cd 
'/<>/.pybuild/cpython3_3.9_py-spinners/build'; tox -c 
'/<>'/tox.ini --sitepackages -e py39
dh_auto_test: error: pybuild --test --test-tox -i python{version} -p 3.9 
returned exit code 13
make: *** [debian/rules:10: binary] Error 25
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2


The easy solution here is to drop the Build-Dep on tox (which exposes a
missing build-dep on setuptools):

diff -Nru python-spinners-0.0~git20200220.a73d561/debian/control 
python-spinners-0.0~git20200220.a73d561/debian/control
--- python-spinners-0.0~git20200220.a73d561/debian/control  2021-08-23 
21:18:47.0 -0700
+++ python-spinners-0.0~git20200220.a73d561/debian/control  2021-11-05 
01:10:31.0 -0700
@@ -7,7 +7,7 @@
python3-all,
python3-coverage,
python3-nose,
-   tox
+   python3-setuptools,
 Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: https://github.com/manrajgrover/py-spinners

SR

Bug#998624: python-deprecated: FTBFS with dh-python 5.20211105 due to missing dependencies

2021-11-05 Thread Stefano Rivera

Source: python-deprecated
Version: 1.2.13-1
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source

dh-python 5.20211105 fixed tox detection based on Build-Depends, which
causes it to try to run tox tests on python-deprecated.
This fails because the tox.ini specifies dependencies that aren't met:

   dh_auto_test -O--buildsystem=pybuild
I: pybuild base:237: cd 
/<>/.pybuild/cpython3_3.9_deprecated/build; tox -c 
/<>/tox.ini --sitepackages -e py39
GLOB sdist-make: /<>/setup.py
py39 create: /<>/.tox/py39
py39 installdeps: PyTest, PyTest-Cov, coverage < 5
WARNING: Discarding $PYTHONPATH from environment, to override specify 
PYTHONPATH in 'passenv' in your configuration.
ERROR: invocation failed (exit code 1), logfile: 
/<>/.tox/py39/log/py39-1.log
== log start ===
Requirement already satisfied: PyTest in /usr/lib/python3/dist-packages (6.2.5)
Requirement already satisfied: PyTest-Cov in /usr/lib/python3/dist-packages 
(3.0.0)
WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, 
status=None)) after connection broken by 'ProxyError('Cannot connect to 
proxy.', NewConnectionError(': Failed to establish a new connection: [Errno 111] Connection 
refused'))': /simple/coverage/
ERROR: Could not find a version that satisfies the requirement coverage<5
ERROR: No matching distribution found for coverage<5

=== log end 
ERROR: could not install deps [PyTest, PyTest-Cov, coverage < 5]; v = 
InvocationError("/<>/.tox/py39/bin/python -m pip install PyTest 
PyTest-Cov 'coverage < 5'", 1)
___ summary 
ERROR:   py39: could not install deps [PyTest, PyTest-Cov, coverage < 5]; v = 
InvocationError("/<>/.tox/py39/bin/python -m pip install PyTest 
PyTest-Cov 'coverage < 5'", 1)
E: pybuild pybuild:354: test: plugin distutils failed with: exit code=1: cd 
/<>/.pybuild/cpython3_3.9_deprecated/build; tox -c 
/<>/tox.ini --sitepackages -e py39
dh_auto_test: error: pybuild --test --test-tox -i python{version} -p 3.9 
returned exit code 13
make: *** [debian/rules:10: build] Error 25
dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2


The easy solution here is to drop the tox Build-Depends (which exposes a
missing Build-Dep on setuptools):

diff -Nru python-deprecated-1.2.13/debian/control 
python-deprecated-1.2.13/debian/control
--- python-deprecated-1.2.13/debian/control 2021-08-15 04:07:04.0 
-0700
+++ python-deprecated-1.2.13/debian/control 2021-11-05 01:03:31.0 
-0700
@@ -8,9 +8,9 @@
python3-all,
python3-pytest,
python3-pytest-cov,
+   python3-setuptools,
python3-sphinx,
-   python3-wrapt,
-   tox
+   python3-wrapt
 Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/python-deprecated
 Vcs-Git: https://salsa.debian.org/debian-gis-team/python-deprecated.git

SR

Bug#998623: pysha3: FTBFS with dh-python 5.20211105 due to missing tox.ini

2021-11-05 Thread Stefano Rivera

Source: pysha3
Version: 1.0.2-4.1
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)

dh-python 5.20211105 fixed tox detection based on Build-Depends, which
causes it to try to run tox tests on pysha3.
As pysha3 doesn't have a tox.ini, this fails:

   dh_auto_test -O--buildsystem=pybuild
I: pybuild base:237: cd /<>/.pybuild/cpython3_3.9_sha3/build; tox 
-c /<>/tox.ini --sitepackages -e py39
ERROR: /<>/tox.ini is neither file or directory
ERROR: tox config file (either pyproject.toml, tox.ini, setup.cfg) not found
E: pybuild pybuild:354: test: plugin distutils failed with: exit code=1: cd 
/<>/.pybuild/cpython3_3.9_sha3/build; tox -c 
/<>/tox.ini --sitepackages -e py39
dh_auto_test: error: pybuild --test --test-tox -i python{version} -p 3.9 
returned exit code 13
make: *** [debian/rules:20: binary] Error 25
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2

Here is a trivial patch to resolve the issue:

diff -Nru pysha3-1.0.2/debian/control pysha3-1.0.2/debian/control
--- pysha3-1.0.2/debian/control 2020-01-19 01:43:49.0 -0800
+++ pysha3-1.0.2/debian/control 2021-11-05 00:54:52.0 -0700
@@ -3,7 +3,6 @@
 Section: python
 Priority: optional
 Build-Depends:
-tox,
 python3-flake8,
 python3-setuptools,
 dh-python,

SR

Bug#997469: dh-python doesn't allow local connections via urllib

2021-10-26 Thread Stefano Rivera

Hi Ole (2021.10.26_11:38:38_-0700)
> All of that said, there's an easy option for you. If you know your
> package needs network access and you're confident that it's not going to
> try to access the internet, you can just 'export http_proxy=' in
> debian/rules, and that will suppress pybuild exporting http_proxy.

FWIW, applied a patch to document this.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#997469: dh-python doesn't allow local connections via urllib

2021-10-26 Thread Stefano Rivera

Control: notfound -1 dh-python/5.20211022.1

Not starting a reassign war, but also, this shouldn't block testing
migration of an unrelated version.

This is the expected behaviour of dh-python. It exports http_proxy,
https_proxy, and no_proxy environment variables.
https://salsa.debian.org/python-team/tools/dh-python/-/blob/ba1110c8700d8ce9b6027117d0f12df7cfb95471/pybuild#L53-67

These variables are hardly standardized, see for example:
https://about.gitlab.com/blog/2021/01/27/we-need-to-talk-no-proxy/

But maybe we could improve them, possibly adding 127.0.0.1 to the
no_proxy list? But I could easily imagine that causing other packages to
fail, getting confused by the comma in no_proxy.

All of that said, there's an easy option for you. If you know your
package needs network access and you're confident that it's not going to
try to access the internet, you can just 'export http_proxy=' in
debian/rules, and that will suppress pybuild exporting http_proxy.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#982298: dh-python: deprecated test command 'python3.9 setup.py test'

2021-10-23 Thread Stefano Rivera

Hi Piotr (2021.10.22_11:06:02_-0700)
> I'm doing some testing to see what effect this will have. There are
> about 500 affected packages, as far as I can tell.

So, about 50 of them fail to build with this change (and a couple go
from FTBFS to building successfully):

--- setuppy-test-failed 2021-10-24 01:50:12.702126456 +
+++ unittest-failed 2021-10-24 01:50:21.006070451 +
@@ -1,29 +1,75 @@
+autopep8_1.5.7-1_arm64.build:Status: attempted
+black_21.4b2-3_arm64.build:Status: attempted
 blessings_1.6-3_arm64.build:Status: attempted
-blist_1.3.6-7_arm64.build:Status: attempted
+debmutate_0.45_arm64.build:Status: attempted
+django-classy-tags_2.0.0-1_arm64.build:Status: attempted
+django-guardian_2.4.0-1_arm64.build:Status: attempted
+django-prometheus_2.1.0-1_arm64.build:Status: attempted
+django-recurrence_1.10.3-1_arm64.build:Status: attempted
 django-restricted-resource_2016.8-3_arm64.build:Status: attempted
+django-sekizai_2.0.0-4_arm64.build:Status: attempted
 doxypypy_0.8.8.6-4_arm64.build:Status: attempted
+elasticsearch-curator_5.8.1-1_arm64.build:Status: attempted
+factory-boy_2.11.1-3_arm64.build:Status: attempted
 fail2ban_0.11.2-2_arm64.build:Status: attempted
+flask-autoindex_0.6.6-2_arm64.build:Status: attempted
 flask-migrate_2.6.0-1_arm64.build:Status: attempted
+flask-testing_0.8.1-1_arm64.build:Status: attempted
 frozen-flask_0.11-3.1_arm64.build:Status: attempted
 glue_0.13-5_arm64.build:Status: attempted
 hydroffice.bag_0.2.15-3_arm64.build:Status: attempted
 khard_0.17.0-2_arm64.build:Status: attempted
+lazr.uri_1.0.6-1_arm64.build:Status: attempted
+lesana_0.8.1-1_arm64.build:Status: attempted
+lttnganalyses_0.6.1-2_arm64.build:Status: attempted
+magic-wormhole_0.12.0-1_arm64.build:Status: attempted
+manuel_1.10.1-2_arm64.build:Status: attempted
+mmllib_0.3.0.post1-2_arm64.build:Status: attempted
+multiprocess_0.70.12.2-1_arm64.build:Status: attempted
 nose_1.3.7-7_arm64.build:Status: attempted
 objgraph_3.5.0-3_arm64.build:Status: attempted
 pelican_4.0.1+dfsg-1.1_arm64.build:Status: attempted
+pocketsphinx-python_0.1.15-2_arm64.build:Status: attempted
+ponyorm_0.7.14-1_arm64.build:Status: attempted
+powerline_2.8.2-1_arm64.build:Status: attempted
 pygithub_1.43.7-1_arm64.build:Status: attempted
 pyliblo_0.10.0-4_arm64.build:Status: attempted
+pyramid-jinja2_2.7+dfsg-1.2_arm64.build:Status: attempted
 pyro4_4.80-1_arm64.build:Status: attempted
+pytables_3.6.1-5_arm64.build:Status: attempted
+python-applicationinsights_0.11.10-1_arm64.build:Status: attempted
+python-argcomplete_1.12.3-0.1_arm64.build:Status: attempted
+python-bitcoinlib_0.11.0-1_arm64.build:Status: attempted
+python-chameleon_3.8.1-1_arm64.build:Status: attempted
+python-ciso8601_2.2.0-1_arm64.build:Status: attempted
+python-configargparse_1.2.3-1_arm64.build:Status: attempted
+python-django-bootstrap-form_3.4-5_arm64.build:Status: attempted
+python-django-colorfield_0.4.5+ds1-1_arm64.build:Status: attempted
+python-django-ical_1.8.0-1_arm64.build:Status: attempted
 python-django-imagekit_4.0.2-3_arm64.build:Status: attempted
 python-django-registration_2.2-5_arm64.build:Status: attempted
+python-django-swapper_1.1.2-2_arm64.build:Status: attempted
+python-funcsigs_1.0.2-5_arm64.build:Status: attempted
 python-jsmin_2.2.2-2_arm64.build:Status: attempted
+python-launchpadlib_1.10.14-1_arm64.build:Status: attempted
+python-libais_0.17+git.20190917.master.e464cf8-2_arm64.build:Status: attempted
 python-libusb1_1.9.1-1_arm64.build:Status: attempted
+python-mpv_0.5.2-1_arm64.build:Status: attempted
+python-ofxhome_0.3.3-3_arm64.build:Status: attempted
+python-phabricator_0.7.0-1.1_arm64.build:Status: attempted
 python-pkginfo_1.4.2-3_arm64.build:Status: attempted
+python-pulp_2.5.1+dfsg-2_arm64.build:Status: attempted
+python-pylibdmtx_0.1.9-3_arm64.build:Status: attempted
 python-pyramid-multiauth_0.8.0-1.1_arm64.build:Status: attempted
 python-pyramid-zcml_1.0.0-1.2_arm64.build:Status: attempted
 python-slimmer_0.1.30-8_arm64.build:Status: attempted
-pytrainer_2.0.2-2_arm64.build:Status: attempted
+python-wadllib_1.3.6-1_arm64.build:Status: attempted
+python-zstd_1.4.5.1-3_arm64.build:Status: attempted
 pyvirtualdisplay_0.2.1-3_arm64.build:Status: attempted
-retweet_0.10-1.1_arm64.build:Status: attempted
+pyzbar_0.1.8-3_arm64.build:Status: attempted
+quark-sphinx-theme_0.5.1-2_arm64.build:Status: attempted
+silver-platter_0.4.3-1_arm64.build:Status: attempted
 simpleeval_0.9.10-1_arm64.build:Status: attempted
 supervisor_4.2.2-2_arm64.build:Status: attempted
+supysonic_0.6.2+ds-3_arm64.build:Status: attempted
+toro_1.0.1-4_arm64.build:Status: attempted

That's enough that I'm not about to just upload this to unstable, unless
someone persuades me that it's a good idea to.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#997662: lintian: Incorrect tag: package-contains-python-dot-directory for .egg-info directories

2021-10-23 Thread Stefano Rivera

Package: lintian
Version: 2.110.0
Severity: normal

Hi, I see lintian 2.110 is now emitting a
package-contains-python-dot-directory tag for .egg-info directories in
binary packages.

We do not want to encourage package maintainers to remove .egg-info
directories from their Python binary packages. Tools inspect these to
know which Python modules are available on the system, as well as many
other things.

I would consider all of these tags to be incorrect:
W: python3-bs4: package-contains-python-dot-directory 
usr/lib/python3/dist-packages/beautifulsoup4-4.10.0.egg-info/
W: python3-bs4: package-contains-python-dot-directory 
usr/lib/python3/dist-packages/beautifulsoup4-4.10.0.egg-info/PKG-INFO
W: python3-bs4: package-contains-python-dot-directory 
usr/lib/python3/dist-packages/beautifulsoup4-4.10.0.egg-info/dependency_links.txt
W: python3-bs4: package-contains-python-dot-directory 
usr/lib/python3/dist-packages/beautifulsoup4-4.10.0.egg-info/requires.txt
W: python3-bs4: package-contains-python-dot-directory 
usr/lib/python3/dist-packages/beautifulsoup4-4.10.0.egg-info/top_level.txt

Thanks,

SR

Bug#982298: dh-python: deprecated test command 'python3.9 setup.py test'

2021-10-22 Thread Stefano Rivera

Hi Piotr (2021.02.09_03:26:04_-0800)
> > > actually… pybuild should invoke something like this:
> > > `{interpreter} -m unittest discover -v {args}`
> > > so I don't know where "setup.py test" came from. Can you point me to
> 
> pybuild *does* that for distutils plugin. I will not change it in this
> release cycle as I don't know how many packages depend on that

It's the next cycle, so let's do this.

I'm doing some testing to see what effect this will have. There are
about 500 affected packages, as far as I can tell.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#996949: dh-python: Errors in python3 maintainer scripts caused by ordering of d.control fields

2021-10-21 Thread Stefano Rivera

A scan of unstable doesn't turn up any affected packages, phew.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#996949: dh-python: Errors in python3 maintainer scripts caused by ordering of d.control fields

2021-10-21 Thread Stefano Rivera

Hi Neil (2021.10.21_02:25:00_-0700)
> After inspecting the locally built package against the package already
> in the archive and rolling back each change in turn, the only change
> which causes a failure is the change to reorder the fields in d.control.
> 
> With that identified, the only change in the resulting .deb binaries
> from that change is that the maintainer scripts call py3compile
> python3-envparse:amd64 instead of py3compile python3-envparse

Thanks for debugging that. Clearly fallout from the patch for bug
#991146.

> Policy requires that the ordering of *blocks* in d.control is
> significant (Source before Package) but Policy does not require any
> specific ordering of fields within the blocks. It appears that dh-python
> is reliant on what is only a convention - that Source and/or Package are
> the first fields in the relevant blocks of d.control.

Ack, I'll try to get that fixed ASAP.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#994045: Root cause of 994045

2021-10-20 Thread Stefano Rivera

Hi Michalik, (2021.09.11_01:54:07_-0700)
> The try..except ladder in _get_html_page() uses
> 
> 
> 
> while the exception raised by requests is
> 
> 
> 
> and so pip does not recognize the two as equal.

They *should* be the same, the pip._vendor mechanism should have put the
requests whl on sys.path and aliased it through the pip._vendor tree:

This test is not attempting to duplicate the virtualenv bootstrap
environment, so it's possible that I'm missing something, but:

$ python3
Python 3.7.3 (default, Jan 22 2021, 20:04:44)
[GCC 8.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import pip._vendor.requests.exceptions
>>> import requests.exceptions
>>> pip._vendor.requests.exceptions is requests.exceptions
True
>>> pip._vendor.requests.exceptions.HTTPError is requests.exceptions.HTTPError
True
>>> requests.__path__
['/usr/share/python-wheels/requests-2.21.0-py2.py3-none-any.whl/requests']

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#994045: python-pip-whl: pip 18.1 raises EnvironmentError on 404 from index, which leads to PIP_FIND_LINKS being ignored

2021-10-20 Thread Stefano Rivera

Hi MrMino (2021.09.10_08:45:58_-0700)
> Since python-virtualenv will try to install pkg_resources==0.0.0 as a
> separate package (which does not exist on any Python index, given that
> it's a part of setuptools), it will instruct pip to do something akin to
> "pip install pkg_resources". Pip will ask the index about pkg_resources,
> which will return a 404. Then, pip will move to resolving the dependency
> using PIP_FIND_LINKS.

Somewhat related is #994952. The patch I'm proposing for Buster will
avoid trying to install pkg_resources==0.0.0. But setuptools and pip
still need to be installable from your index or you'll still hit this
bug.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#994952: Fails to create Python 3 virtualenv in buster: 404 Client Error: Not Found for url: https://pypi.org/simple/pkg-resources/

2021-10-20 Thread Stefano Rivera

Filed bug #996929 to update Buster.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#996929: buster-pu: package python-virtualenv/15.1.0+ds-2

2021-10-20 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian@packages.debian.org
Usertags: pu

[ Reason ]
python-virtualenv recently had a regression in buster caused by a
server-side change on pypi.org (#994952).
It started to 404 (breaking virtualenv) where it had previously returned
an empty directory listing for the pkg_resources package.

pip, setuptools, and pkg_resources are bootstrapped into virtualenvs.

pkg_resources is part of the setuptools PyPI package, upstream. But in
Debian its packaged as its own binary package, so we have some patches
in Debian to explicitly install pkg_resources.

The old behaviour is currently back on pypi.org, see
https://github.com/pypa/warehouse/issues/10081

But the fix to avoid virtualenv from depending on this empty directory
listing is very simple, so we should probably apply it.

[ Impact ]
Reliance on pypi.org serving a workaround for our virtualenv version.
Without that workaround, virtualenv fails (unless explicitly run with
--no-download)

[ Tests ]
Manually tested behaviour with and without --no-download.

[ Risks ]
Trivial patch.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
When bootstrapping setuptools and pip into the virtualenv *from PyPI*,
don't ask pip to install pkg_resources.

[ Other info ]
(Anything else the release team should know.)
diff -Nru python-virtualenv-15.1.0+ds/debian/changelog 
python-virtualenv-15.1.0+ds/debian/changelog
--- python-virtualenv-15.1.0+ds/debian/changelog2018-12-13 
11:19:35.0 -0800
+++ python-virtualenv-15.1.0+ds/debian/changelog2021-10-20 
15:48:33.0 -0700
@@ -1,3 +1,9 @@
+python-virtualenv (15.1.0+ds-2+deb10u1) buster; urgency=medium
+
+  * Avoid attempting to install pkg_resources from PyPI. (Closes: #994952)
+
+ -- Stefano Rivera   Wed, 20 Oct 2021 15:48:33 -0700
+
 python-virtualenv (15.1.0+ds-2) unstable; urgency=medium
 
   [ Vincent Bernat ]
diff -Nru python-virtualenv-15.1.0+ds/debian/patches/use-wheels.patch 
python-virtualenv-15.1.0+ds/debian/patches/use-wheels.patch
--- python-virtualenv-15.1.0+ds/debian/patches/use-wheels.patch 2018-12-13 
11:19:35.0 -0800
+++ python-virtualenv-15.1.0+ds/debian/patches/use-wheels.patch 2021-10-20 
15:48:33.0 -0700
@@ -22,8 +22,8 @@
  scripts/virtualenv  |  9 +++
  setup.py|  4 ++--
  virtualenv.egg-info/SOURCES.txt |  4 ++--
- virtualenv.py   | 52 ++---
- 4 files changed, 62 insertions(+), 7 deletions(-)
+ virtualenv.py   | 53 ++---
+ 4 files changed, 63 insertions(+), 7 deletions(-)
 
 diff --git a/scripts/virtualenv b/scripts/virtualenv
 index 418bd79..7dd0203 100644
@@ -126,7 +126,7 @@
  if cert_data is not None:
  cert_file = tempfile.NamedTemporaryFile(delete=False)
  cert_file.write(cert_data)
-@@ -928,8 +948,34 @@ def create_environment(home_dir, site_packages=False, 
clear=False,
+@@ -928,8 +948,35 @@ def create_environment(home_dir, site_packages=False, 
clear=False,
  
  to_install = []
  
@@ -157,7 +157,8 @@
 +
  if not no_setuptools:
  to_install.append('setuptools')
-+to_install.append('pkg_resources')
++if not download:
++to_install.append('pkg_resources')
  
  if not no_pip:
  to_install.append('pip')

Bug#994952: Fails to create Python 3 virtualenv in buster: 404 Client Error: Not Found for url: https://pypi.org/simple/pkg-resources/

2021-10-20 Thread Stefano Rivera

Hi Debian (2021.09.23_13:56:44_-0700)
> Creating a virtualenv fails, we presume this is a recent regression due
> to some server-side change on PyPI.

I never found anything in the warehouse git history to explain that, but
https://pypi.org/simple/pkg-resources/ now returns a 200 and an empty
directory listing, so things are working again.

However, there is a simple change we can make to avoid needing this
directory to exist, so I'll run that by the stable release team.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#994538: dh-python: alias /usr/bin/python disappears after installation

2021-10-15 Thread Stefano Rivera

tag -1 + moreinfo

Hi Jérémie (2021.09.17_05:08:02_-0700)
> *** Reporter, please consider answering these questions, where appropriate ***
> 
>* What led up to the situation?
>* What exactly did you do (or not do) that was effective (or
>  ineffective)?
>* What was the outcome of this action?
>* What outcome did you expect instead?
> 
> *** End of the template - remove these template lines ***

Please include *something* to explain what happened, otherwise we'll
close this bug.
The questions in the template above would be the things to answer.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#994979: python-tomli: please make the build reproducible

2021-10-15 Thread Stefano Rivera

FYI, this will be fixed in the next dh-python upload: 
https://salsa.debian.org/python-team/tools/dh-python/-/commit/2ef6ff13748984258d5da000c17d9cdad707b9ae

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#732713: dh-python testsuite fails (wrong assumptions about symlink handling)

2021-10-13 Thread Stefano Rivera

Control: retitle -1 test t201 fails: has wrong assumptions about symlink 
handling
Control: severity -1 minor

Given the death of Python 2.7, demoting the test20* issues.

Going to re-enable the build-time test site without them.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#934372: snapd: does not work under cgroup v2 at all

2021-10-10 Thread Stefano Rivera

Control: forwarded -1 https://bugs.launchpad.net/snapd/+bug/1926283
Control: severity -1 important

Bumping the severity back up, because this breaks unrelated software
(#996036), also re-pointing at the current upstream issue.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#996036: LXD: snap lxd cgroup noise causes VirtSubproc to fail

2021-10-10 Thread Stefano Rivera

Hi Paul (2021.10.10_11:59:12_-0700)
> Shouldn't that bug be raised in severity, considering the request you
> are now asking from autopkgtest? I'm not really enthusiastic to add this
> kind of "work around" code for a bug that's already known for 2 years.
> Maybe there should be a warning in snapd to silence that warning?

Yeah, I'm with you on that. It's an annoying message.

Also, found another place I had to hack (my local hacks all got blown
away by the recent autopkgtest upload, so it was a good time to forward
them...)

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272
From 084996eb89aa99f2907ed24b5d4c83f5f7480610 Mon Sep 17 00:00:00 2001
From: Stefano Rivera 
Date: Sun, 10 Oct 2021 10:58:37 -0700
Subject: [PATCH] Ignore innoccuous warnings from snapped lxd

They don't mean that the command has failed
---
 lib/VirtSubproc.py | 4 
 lib/adt_testbed.py | 5 +
 2 files changed, 9 insertions(+)

diff --git a/lib/VirtSubproc.py b/lib/VirtSubproc.py
index bf948e6..01acdaa 100644
--- a/lib/VirtSubproc.py
+++ b/lib/VirtSubproc.py
@@ -186,6 +186,10 @@ def check_exec(argv, downp=False, outp=False, timeout=0, fail_on_stderr=True):
 if status:
 bomb("%s%s failed (exit status %d, stderr %r)" %
  ((downp and "(down) " or ""), argv, status, err))
+# Ignore innoccuous warnings from snapped lxd
+if (err == 'WARNING: cgroup v2 is not fully supported yet, proceeding with '
+   'partial confinement\n'):
+err = ''
 if fail_on_stderr and err:
 bomb("%s unexpectedly produced stderr output `%s'" %
  (argv, err))
diff --git a/lib/adt_testbed.py b/lib/adt_testbed.py
index 9965e5d..909213c 100644
--- a/lib/adt_testbed.py
+++ b/lib/adt_testbed.py
@@ -554,6 +554,11 @@ class Testbed:
 self.command('auxverb_debug_fail')
 self.bomb('testbed auxverb failed with exit code %i' % proc.returncode)
 
+# Ignore innoccuous warnings from snapped lxd
+if (err == 'WARNING: cgroup v2 is not fully supported yet, proceeding '
+   'with partial confinement\n'):
+err = ''
+
 return (proc.returncode, out, err)
 
 def check_exec(self, argv, stdout=False, kind='short'):
-- 
2.33.0



signature.asc
Description: PGP signature

Bug#996036: LXD: snap lxd cgroup noise causes VirtSubproc to fail

2021-10-10 Thread Stefano Rivera

Package: autopkgtest
Version: 5.17
Severity: normal
Tags: patch

lxd is not packaged for Debian at the moment (ITP #768073), so the
common way to install it on Debian is through snapd.

Unfortunately executing any confined snapped binaries outputs a line on
stderr:
> WARNING: cgroup v2 is not fully supported yet, proceeding with partial 
> confinement

autopkgtest's VirtSubProc will (by default) fail if anything is emitted
to stderr, breaking the build immediately:

> : failure: ['lxc', 'launch', '--ephemeral', 
> 'autopkgtest/debian/unstable/amd64', 'autopkgtest-lxd-uqbaqs'] unexpectedly 
> produced stderr output `WARNING: cgroup v2 is not fully supported yet, 
> proceeding with partial confinement
> '
> Undefined return value after 'open'
> E: Error creating chroot session: skipping python3.10

This message can't be suppressed, as far as I am aware, so the easiest is to
just not fail when we see them.

I've been using sbuild + autopkgtest + snapped lxd successfully with this patch
for several months.
There are probably prettier ways of dealing with the problem (and even
filtering these messages from the output), but this has the benefit of being
simple.

SR

-- System Information:
Debian Release: bookworm/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/16 CPU threads)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages autopkgtest depends on:
ii  apt-utils   2.3.9
ii  libdpkg-perl1.20.9
ii  procps  2:3.3.17-5
ii  python3 3.9.2-3
ii  python3-debian  0.1.39

Versions of packages autopkgtest recommends:
ii  autodep8  0.25

Versions of packages autopkgtest suggests:
pn  fakemachine   
pn  lxc   
pn  lxd   
ii  ovmf  2020.11-5
pn  ovmf-ia32 
pn  qemu-efi-aarch64  
pn  qemu-efi-arm  
pn  qemu-system   
ii  qemu-utils1:6.1+dfsg-6
ii  schroot   1.6.10-12
pn  vmdb2 

-- no debconf information
From d420aa1953b891778b57a96a53cb58774a76c6a2 Mon Sep 17 00:00:00 2001
From: Stefano Rivera 
Date: Sun, 10 Oct 2021 10:58:37 -0700
Subject: [PATCH] Ignore innoccuous warnings from snapped lxd

They don't mean that the command has failed
---
 lib/VirtSubproc.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/lib/VirtSubproc.py b/lib/VirtSubproc.py
index bf948e6..01acdaa 100644
--- a/lib/VirtSubproc.py
+++ b/lib/VirtSubproc.py
@@ -186,6 +186,10 @@ def check_exec(argv, downp=False, outp=False, timeout=0, fail_on_stderr=True):
 if status:
 bomb("%s%s failed (exit status %d, stderr %r)" %
  ((downp and "(down) " or ""), argv, status, err))
+# Ignore innoccuous warnings from snapped lxd
+if (err == 'WARNING: cgroup v2 is not fully supported yet, proceeding with '
+   'partial confinement\n'):
+err = ''
 if fail_on_stderr and err:
 bomb("%s unexpectedly produced stderr output `%s'" %
  (argv, err))
-- 
2.33.0

Bug#941830: pypy3: "import numpy" complains with: "Original error was: No module named 'numpy.core._multiarray_umath'"

2021-10-06 Thread Stefano Rivera

Hi Kingsley (2019.10.05_20:32:52_-0700)
> Here's how I elicited the error:
> 
> 1.) $ pypy3
> 
> 2.) import numpy

I'm afraid python3-numpy is only built against cpython. We haven't had
had debian python package maintainers start to build their (non-pure
python) packages for pypy3 too, yet.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#995795: mercurial: Cloning a local repo with long filenames fails (fixed upstream in 5.9.1)

2021-10-05 Thread Stefano Rivera

Package: mercurial
Version: 5.9-3
Severity: normal
Tags: upstream patch
Forwarded: https://bz.mercurial-scm.org/show_bug.cgi?id=6581

Mercurial 5.9 fails to locally clone my pypy hg repo, due to
https://bz.mercurial-scm.org/show_bug.cgi?id=6581

Fixed by https://phab.mercurial-scm.org/D11340 in 5.9.1, upstream.

SR

-- System Information:
Debian Release: bookworm/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/16 CPU threads)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages mercurial depends on:
ii  libc6 2.32-4
ii  mercurial-common  5.9-3
ii  python3   3.9.2-3
ii  ucf   3.0043

Versions of packages mercurial recommends:
ii  openssh-client  1:8.4p1-6

Versions of packages mercurial suggests:
ii  meld  3.20.4-1
pn  qct   

-- no debconf information

Bug#902167: distro-info: ubuntu-distro-info incorrectly lists the development release in --supported

2021-09-30 Thread Stefano Rivera

Hi Daniel (2018.06.22_18:56:11_-0700)
> I've prepared the attached patch against the Ubuntu packaging to fix the
> apparently incorrect output for --supported.  I will be seeking
> sponsorship for it in the coming days.

Sorry for never replying to this.

I agree that the current behaviour for --supported doesn't match the
documentation, and would be better named --active or --created.

I'm sure this would have a knock-on effect for consumers that we'd have
to investigate and resolve first.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#994953: virtualenv: --no-setuptools fails with KeyError: 'setuptools'

2021-09-23 Thread Stefano Rivera

Package: virtualenv
Version: 20.4.0+ds-2
Severity: normal

$ virtualenv -p python3 --no-setuptools testve
KeyError: 'setuptools'

# virtualenv --with-traceback --no-setuptools -p python3 /tmp/v
Traceback (most recent call last):
  File "/usr/bin/virtualenv", line 33, in 
sys.exit(load_entry_point('virtualenv==20.4.0+ds', 'console_scripts', 
'virtualenv')())
  File "/usr/lib/python3/dist-packages/virtualenv/__main__.py", line 65, in 
run_with_catch
run(args, options, env)
  File "/usr/lib/python3/dist-packages/virtualenv/__main__.py", line 18, in run
session = cli_run(args, options, env)
  File "/usr/lib/python3/dist-packages/virtualenv/run/__init__.py", line 32, in 
cli_run
of_session.run()
  File "/usr/lib/python3/dist-packages/virtualenv/run/session.py", line 47, in 
run
self._seed()
  File "/usr/lib/python3/dist-packages/virtualenv/run/session.py", line 60, in 
_seed
self.seeder.run(self.creator)
  File 
"/usr/lib/python3/dist-packages/virtualenv/seed/embed/via_app_data/via_app_data.py",
 line 43, in run
with self._get_seed_wheels(creator) as name_to_whl:
  File "/usr/lib/python3.9/contextlib.py", line 117, in __enter__
return next(self.gen)
  File 
"/usr/lib/python3/dist-packages/virtualenv/seed/embed/via_app_data/via_app_data.py",
 line 130, in _get_seed_wheels
if name_to_whl['setuptools'].path.is_relative_to(BUNDLE_FOLDER):
KeyError: 'setuptools'

SR

-- System Information:
Debian Release: bookworm/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/16 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages virtualenv depends on:
ii  python3-virtualenv  20.4.0+ds-2

virtualenv recommends no packages.

virtualenv suggests no packages.

-- no debconf information

Bug#994952: Fails to create Python 3 virtualenv in buster: 404 Client Error: Not Found for url: https://pypi.org/simple/pkg-resources/

2021-09-23 Thread Stefano Rivera

Package: python3-virtualenv
Version: 15.1.0+ds-2
Severity: important
Tags: buster
Control: notfound -1 20.4.0+ds-2

Creating a virtualenv fails, we presume this is a recent regression due
to some server-side change on PyPI.

Workaround: --no-download works
(which you can follow with a ve/bin/python -m pip install -U pip setuptools)

# virtualenv -p python3 testve
Already using interpreter /usr/bin/python3
Using base prefix '/usr'
New python executable in /root/testve/bin/python3
Also creating executable in /root/testve/bin/python
Installing setuptools, pkg_resources, pip, wheel...
  Complete output from command /root/testve/bin/python3 - setuptools 
pkg_resources pip wheel:
  Looking in links: /usr/lib/python3/dist-packages, /usr/share/python-wheels/
Collecting setuptools
  Downloading 
https://files.pythonhosted.org/packages/4e/2e/f8e006dbaaa46ed1e762c287585b92476deb8d3ccb79b720ed3b86bc6113/setuptools-58.1.0-py3-none-any.whl
 (816kB)
Collecting pkg_resources
Could not install packages due to an EnvironmentError: 404 Client Error: Not 
Found for url: https://pypi.org/simple/pkg-resources/


...Installing setuptools, pkg_resources, pip, wheel...done.
Traceback (most recent call last):
  File "/usr/bin/virtualenv", line 11, in 
load_entry_point('virtualenv==15.1.0', 'console_scripts', 'virtualenv')()
  File "/usr/lib/python3/dist-packages/virtualenv.py", line 724, in main
symlink=options.symlink)
  File "/usr/lib/python3/dist-packages/virtualenv.py", line 996, in 
create_environment
download=download,
  File "/usr/lib/python3/dist-packages/virtualenv.py", line 926, in 
install_wheel
call_subprocess(cmd, show_stdout=False, extra_env=env, stdin=SCRIPT)
  File "/usr/lib/python3/dist-packages/virtualenv.py", line 817, in 
call_subprocess
% (cmd_desc, proc.returncode))
OSError: Command /root/testve/bin/python3 - setuptools pkg_resources pip wheel 
failed with error code 1

-- System Information:
Debian Release: 10.10
  APT prefers oldstable
  APT policy: (500, 'oldstable')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/16 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE=C.UTF-8 
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages python3-virtualenv depends on:
ii  python-pip-whl 18.1-5
ii  python33.7.3-1
ii  python3-distutils  3.7.3-1
ii  python3-pkg-resources  40.8.0-1

python3-virtualenv recommends no packages.

python3-virtualenv suggests no packages.

-- no debconf information

Bug#994924: python-virtualenv: "pip list --outdated" fails

2021-09-23 Thread Stefano Rivera

Hi Florian (2021.09.23_02:02:49_-0700)
>   File 
> "/usr/share/python-wheels/html5lib-1.1-py2.py3-none-any.whl/html5lib/treebuilders/__init__.py",
>  line 85, in getTreeBuilder
> return etree.getETreeModule(implementation, **kwargs).TreeBuilder
> AttributeError: module 'html5lib.treebuilders.etree' has no attribute 
> 'getETreeModule'

Interesting bug. It occurs on new venvs, but goes away as soon as I
start poking at it. And I can't figure out why...

I don't see anything like this reported upstream, so I assume it's
something to do with the de-vendored pip in Debian.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#994769: python-xattr: autopkgtest fails on tmpfs

2021-09-20 Thread Stefano Rivera

Hi Debian (2021.09.20_09:59:25_-0700)
> #debian-release suggests using /var/tmp instead of /tmp, which will be
> backed by a real filesystem (of some sort) on ci.debian.net nodes. Patch
> attached.

Another suggestion is to use https://github.com/fbarriga/fuse_xattrs
(not currently packaged in Debian).

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#994769: python-xattr: autopkgtest fails on tmpfs

2021-09-20 Thread Stefano Rivera

Source: python-xattr
Version: 0.9.7-1
Severity: important
Tags: patch

The python-xattr autopkgtest is breaking on CI workers that use tmpfs to
back $AUTOPKGTEST_TMP.

This is currently blocking python-cffi migration due to the spurious
failure.

From tmpfs(5):
> The tmpfs filesystem supports extended attributes (see xattr(7)), but
> user extended attributes are not permitted.
https://man7.org/linux/man-pages/man5/tmpfs.5.html

#debian-release suggests using /var/tmp instead of /tmp, which will be
backed by a real filesystem (of some sort) on ci.debian.net nodes. Patch
attached.

I also notice that upstream ships a full test suite in xattr/tests/ but
these aren't run at build time (as far as I can see) or in the
autopkgtest. They could be...

Thanks,

SR
diff --git a/debian/tests/cli b/debian/tests/cli
index 4249244..75e2043 100755
--- a/debian/tests/cli
+++ b/debian/tests/cli
@@ -2,7 +2,7 @@
 
 set -e
 
-cd "$AUTOPKGTEST_TMP"
+cd /var/tmp
 
 FILE="file"
 NAME="user.n"

Bug#987372: buster-pu: package distro-info-data/0.41+deb10u3 OR (distro-info/1.0~deb10u1 AND distro-info-data/0.47~deb10u1)

2021-09-17 Thread Stefano Rivera

Hi SRMs (2021.04.22_09:57:49_-0700)

Given the lack of reply here, let's stick with the minimal option.

There have been more changes since the last patch, so here's an updated
debdiff. Uploaded to buster-proposed-updates.

> [ Checklist ]
>   [x] *all* changes are documented in the d/changelog
>   [x] I reviewed all changes and I approve them
>   [x] attach debdiff against the package in stable
>   [x] the issue is verified as fixed in unstable

Still true.

Changes:

distro-info-data (0.41+deb10u4) buster; urgency=medium

  * Update data to 0.51, without new columns:
- Add estimated date for Buster EOL.
- Correct the EOL date for Debian Jessie.
- Add Debian 13 "Trixie", with a rough date.
- Add Ubuntu 21.10, Impish Indri.
- Move Ubuntu EoLs off weekends.
- Validate that Ubuntu EoLs occur during the week.
- Set bullseye's release date, bookworm's creation date, and buster's EoL
  date based on the updated planned bullseye release date.

 -- Stefano Rivera   Fri, 17 Sep 2021 15:30:21 -0700

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272
diff -Nru distro-info-data-0.41+deb10u3/debian/changelog 
distro-info-data-0.41+deb10u4/debian/changelog
--- distro-info-data-0.41+deb10u3/debian/changelog  2020-11-02 
12:44:14.0 -0800
+++ distro-info-data-0.41+deb10u4/debian/changelog  2021-09-17 
15:30:21.0 -0700
@@ -1,3 +1,17 @@
+distro-info-data (0.41+deb10u4) buster; urgency=medium
+
+  * Update data to 0.51, without new columns:
+- Add estimated date for Buster EOL.
+- Correct the EOL date for Debian Jessie.
+- Add Debian 13 "Trixie", with a rough date.
+- Add Ubuntu 21.10, Impish Indri.
+- Move Ubuntu EoLs off weekends.
+- Validate that Ubuntu EoLs occur during the week.
+- Set bullseye's release date, bookworm's creation date, and buster's EoL
+  date based on the updated planned bullseye release date.
+
+ -- Stefano Rivera   Fri, 17 Sep 2021 15:30:21 -0700
+
 distro-info-data (0.41+deb10u3) buster; urgency=medium
 
   * Update data to 0.45:
diff -Nru distro-info-data-0.41+deb10u3/debian.csv 
distro-info-data-0.41+deb10u4/debian.csv
--- distro-info-data-0.41+deb10u3/debian.csv2020-11-02 12:44:14.0 
-0800
+++ distro-info-data-0.41+deb10u4/debian.csv2021-09-17 15:30:21.0 
-0700
@@ -11,10 +11,11 @@
 5.0,Lenny,lenny,2007-04-08,2009-02-14,2012-02-06
 6.0,Squeeze,squeeze,2009-02-14,2011-02-06,2014-05-31
 7,Wheezy,wheezy,2011-02-06,2013-05-04,2016-04-26
-8,Jessie,jessie,2013-05-04,2015-04-25,2018-06-06
+8,Jessie,jessie,2013-05-04,2015-04-25,2018-06-17
 9,Stretch,stretch,2015-04-25,2017-06-17,2020-07-06
-10,Buster,buster,2017-06-17,2019-07-06
-11,Bullseye,bullseye,2019-07-06
-12,Bookworm,bookworm,2021-08-01
+10,Buster,buster,2017-06-17,2019-07-06,2022-08-14
+11,Bullseye,bullseye,2019-07-06,2021-08-14,2024-08-14
+12,Bookworm,bookworm,2021-08-14
+13,Trixie,trixie,2023-08-01
 ,Sid,sid,1993-08-16
 ,Experimental,experimental,1993-08-16
diff -Nru distro-info-data-0.41+deb10u3/ubuntu.csv 
distro-info-data-0.41+deb10u4/ubuntu.csv
--- distro-info-data-0.41+deb10u3/ubuntu.csv2020-11-02 12:44:14.0 
-0800
+++ distro-info-data-0.41+deb10u4/ubuntu.csv2021-09-17 15:30:21.0 
-0700
@@ -32,4 +32,5 @@
 19.10,Eoan Ermine,eoan,2019-04-18,2019-10-17,2020-07-17
 20.04 LTS,Focal Fossa,focal,2019-10-17,2020-04-23,2025-04-23
 20.10,Groovy Gorilla,groovy,2020-04-23,2020-10-22,2021-07-22
-21.04,Hirsute Hippo,hirsute,2020-10-22,2021-04-22,2022-01-22
+21.04,Hirsute Hippo,hirsute,2020-10-22,2021-04-22,2022-01-20
+21.10,Impish Indri,impish,2021-04-22,2021-10-14,2022-07-14
diff -Nru distro-info-data-0.41+deb10u3/validate-csv-data 
distro-info-data-0.41+deb10u4/validate-csv-data
--- distro-info-data-0.41+deb10u3/validate-csv-data 2020-11-02 
12:44:14.0 -0800
+++ distro-info-data-0.41+deb10u4/validate-csv-data 2021-09-17 
15:30:21.0 -0700
@@ -21,6 +21,7 @@
 import optparse
 import os
 import sys
+from datetime import date
 
 _COLUMNS = {
 "debian": ("version", "codename", "series", "created", "release", "eol"),
@@ -121,6 +122,17 @@
"to the given date in column `%s'")
 error(filename, csvreader.line_num, msg, date1, date2)
 failures += 1
+# Check that Ubuntu EOL lands on a weekday
+if distro == 'ubuntu':
+for column, eol_date in row.items():
+if not column.startswith('eol'):
+continue
+if not eol_date:
+continue
+if eol_date.weekday() > 5 and eol_date >= date(2021, 1, 1):
+msg = '%s for %s lands on a weekend (%s)'
+error(filename, csvreader.line_num, msg, column,
+  row['codename'], date)
 
 return failures == 0

Bug#994281: dh-python: flit plugin doesn't support test runners

2021-09-14 Thread Stefano Rivera

Package: dh-python
Version: 4.20201102+nmu1
Severity: normal

The flit plugin doesn't run tests.

I have to use "--system custom --test-args ..." to execute nose, for
example.

SR

-- System Information:
Debian Release: bookworm/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/16 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages dh-python depends on:
ii  python33.9.2-3
ii  python3-distutils  3.9.7-1

dh-python recommends no packages.

Versions of packages dh-python suggests:
ii  dpkg-dev  1.20.9
ii  libdpkg-perl  1.20.9

-- no debconf information

Bug#994280: ITP: confuse -- Python Library for painless YAML configuration

2021-09-14 Thread Stefano Rivera

Package: wnpp
Severity: wishlist
Owner: Stefano Rivera 

* Package name: python-confuse
  Version : 1.5.0
  Upstream Author : Adrian Sampson 
* URL : https://github.com/beetbox/confuse
* License : Expat
  Programming Lang: Python
  Description : Python Library for painless YAML configuration

Binary package names: python3-confuse

 Confuse is a configuration library for Python that uses YAML. It takes
 care of defaults, overrides, type checking, command-line integration,
 human-readable errors, and standard OS-specific locations.

Confuse is a dependency of beets 1.5.0, and I intend to package it under
the Debian Python Team.

Bug#994279: ITP: pyreflink -- Python Library wrapping platform-specific reflink implementations

2021-09-14 Thread Stefano Rivera

Package: wnpp
Severity: wishlist
Owner: Stefano Rivera 
X-Debbugs-Cc: debian-de...@lists.debian.org

* Package name: pyreflink
  Version : 0.2.1
  Upstream Author : Ruben De Smet
* URL : https://gitlab.com/rubdos/pyreflink
* License : Expat
  Programming Lang: Python (CFFI C extensions)
  Description : Python Library wrapping platform-specific reflink 
implementations

 Python wrapper around the ``reflink`` system calls.
 .
 Features:
 .
  * Btrfs, XFS, OCFS2 ``reflink`` support. Btrfs is tested the most.
  * Apple macOS APFS ``clonefile`` support. Little testing, be careful. It
might eat data.
  * A convenience method that checks support for reflinks within a specific
directory.

I intend to maintain this under the Debian Python Team, as a dependency
of the beets testsuite.

Bug#991560: unblock: six/1.16.0-2

2021-07-27 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: cjwat...@debian.org

Please unblock package six

six (1.16.0-2) unstable; urgency=medium

  * Team upload.

  [ Andreas Beckmann ]
  * python-six/python3-six: Copy Breaks: python (<< 2.7.18),
python-minimal (<< 2.7.18), libpython-stdlib (<< 2.7.18),
python-iso8601 (<< 0.1.12-2~), python-pbr (<< 5.4.5) from python2.7 to
ensure removal of the unversioned python packages (and some persisting
obsolete Python 2 module packages) on upgrades from buster. In some
upgrade scenarios (mostly involving openstack packages) these Breaks in
python2.7 were ineffective because the unversioned python packages got
higher scores than python2.7. python-six/python3-six are usually very
high scoring Python module packages in these cases, making them ideal
candidates for such copies of the Breaks.  (Closes: #991433)

[ Reason ]
Smoother python 2 -> 3 upgrades.

[ Impact ]
Users upgrading from buster could be left using a removed python 2
stack, rather than being upgraded to python 3.

[ Tests ]
Verified that they upgrade from buster without issue.

[ Risks ]
Adds breaks only.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock six/1.16.0-2
diff -Nru six-1.16.0/debian/changelog six-1.16.0/debian/changelog
--- six-1.16.0/debian/changelog 2021-05-09 06:40:54.0 -0400
+++ six-1.16.0/debian/changelog 2021-07-27 11:44:18.0 -0400
@@ -1,3 +1,21 @@
+six (1.16.0-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Andreas Beckmann ]
+  * python-six/python3-six: Copy Breaks: python (<< 2.7.18),
+python-minimal (<< 2.7.18), libpython-stdlib (<< 2.7.18),
+python-iso8601 (<< 0.1.12-2~), python-pbr (<< 5.4.5) from python2.7 to
+ensure removal of the unversioned python packages (and some persisting
+obsolete Python 2 module packages) on upgrades from buster. In some
+upgrade scenarios (mostly involving openstack packages) these Breaks in
+python2.7 were ineffective because the unversioned python packages got
+higher scores than python2.7. python-six/python3-six are usually very
+high scoring Python module packages in these cases, making them ideal
+candidates for such copies of the Breaks.  (Closes: #991433)
+
+ -- Stefano Rivera   Tue, 27 Jul 2021 11:44:18 -0400
+
 six (1.16.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru six-1.16.0/debian/control six-1.16.0/debian/control
--- six-1.16.0/debian/control   2021-05-09 06:40:54.0 -0400
+++ six-1.16.0/debian/control   2021-07-27 11:44:18.0 -0400
@@ -26,6 +26,11 @@
 Multi-Arch: foreign
 Depends: ${misc:Depends},
  ${python:Depends},
+Breaks: python (<< 2.7.18),
+python-minimal (<< 2.7.18),
+libpython-stdlib (<< 2.7.18),
+python-iso8601 (<< 0.1.12-2~),
+python-pbr (<< 5.4.5),
 Description: Python 2 and 3 compatibility library (Python 2 interface)
  Six is a Python 2 and 3 compatibility library. It provides utility
  functions for smoothing over the differences between the Python versions
@@ -40,6 +45,9 @@
 Multi-Arch: foreign
 Depends: ${misc:Depends},
  ${python3:Depends},
+Breaks: python (<< 2.7.18),
+python-minimal (<< 2.7.18),
+libpython-stdlib (<< 2.7.18),
 Description: Python 2 and 3 compatibility library (Python 3 interface)
  Six is a Python 2 and 3 compatibility library. It provides utility
  functions for smoothing over the differences between the Python versions
diff -Nru six-1.16.0/debian/.gitignore six-1.16.0/debian/.gitignore
--- six-1.16.0/debian/.gitignore2021-05-09 06:40:54.0 -0400
+++ six-1.16.0/debian/.gitignore1969-12-31 20:00:00.0 -0400
@@ -1 +0,0 @@
-/files

Bug#991454: unblock: distro-info-data/0.51

2021-07-23 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package distro-info-data

 distro-info-data (0.51) unstable; urgency=medium

   * Update bullseye's release date, bookworm's creation date, and buster's EoL
 date based on the updated planned bullseye release date.

[ Reason ]
The bullseye tentative release date got finalized, to 2 weeks later.

[ Impact ]
Incorrect data from distro-info.

[ Tests ]
Manually tested around the release date, things seem correct.
Automated tests verify that the format is sane.

[ Risks ]
Data-only package.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock distro-info-data/0.51
diff -Nru distro-info-data-0.50/debian/changelog 
distro-info-data-0.51/debian/changelog
--- distro-info-data-0.50/debian/changelog  2021-06-17 11:01:52.0 
-0400
+++ distro-info-data-0.51/debian/changelog  2021-07-23 20:41:20.0 
-0400
@@ -1,3 +1,10 @@
+distro-info-data (0.51) unstable; urgency=medium
+
+  * Update bullseye's release date, bookworm's creation date, and buster's EoL
+date based on the updated planned bullseye release date.
+
+ -- Stefano Rivera   Fri, 23 Jul 2021 20:41:20 -0400
+
 distro-info-data (0.50) unstable; urgency=medium
 
   * Update buster's EOL day to bullseye's (tentative) release date +1y.
diff -Nru distro-info-data-0.50/debian.csv distro-info-data-0.51/debian.csv
--- distro-info-data-0.50/debian.csv2021-06-17 11:01:52.0 -0400
+++ distro-info-data-0.51/debian.csv2021-07-23 20:41:20.0 -0400
@@ -13,9 +13,9 @@
 7,Wheezy,wheezy,2011-02-06,2013-05-04,2016-04-26,2018-05-31,2020-06-30
 8,Jessie,jessie,2013-05-04,2015-04-25,2018-06-17,2020-06-30,2022-06-30
 9,Stretch,stretch,2015-04-25,2017-06-17,2020-07-06,2022-06-30,2024-06-30
-10,Buster,buster,2017-06-17,2019-07-06,2022-07-31,2024-06-30,2026-06-30
-11,Bullseye,bullseye,2019-07-06,2021-07-31,2024-07-31
-12,Bookworm,bookworm,2021-07-31
+10,Buster,buster,2017-06-17,2019-07-06,2022-08-14,2024-06-30,2026-06-30
+11,Bullseye,bullseye,2019-07-06,2021-08-14,2024-08-14
+12,Bookworm,bookworm,2021-08-14
 13,Trixie,trixie,2023-08-01
 ,Sid,sid,1993-08-16
 ,Experimental,experimental,1993-08-16

Bug#991146: python3-libxml2: ambiguous package name 'python3-libxml2' with more than one installed instance

2021-07-17 Thread Stefano Rivera

Hi Thorsten (2021.07.15_12:27:59_-0400)
> During crossgrading or when installing multiple versions of python3-libxml2
> they fail to configure because of a bug in the postinst script:

I can't reproduce this, apt won't let me install multiple architectures
of python3-libxml2 concurrently, due to dependencies.

Can you provide a minimal recipe for reproducing?

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#991195: appdirs: Friendly Fork: platformdirs

2021-07-16 Thread Stefano Rivera

Source: appdirs
Severity: normal
Forwarded: https://github.com/ActiveState/appdirs/issues/79

Upstream there has been a friendly fork of appdirs to "platformdirs".
Assuming this is the future of the library, we should migrate debian
packages from appdirs to platformdirs, once it's in the archive.

$ reverse-depends src:appdirs
Reverse-Recommends
* python3-profitbricks  (for python3-appdirs)

Reverse-Depends
* black (for python3-appdirs)
* crossgrader   (for python3-appdirs)
* git-phab  (for python3-appdirs)
* matrix-mirage [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x]
* mu-editor (for python3-appdirs)
* nuitka(for python3-appdirs)
* ofxstatement  (for python3-appdirs)
* ofxstatement-plugins  (for python3-appdirs)
* openmotor (for python3-appdirs)
* plover(for python3-appdirs)
* printrun-common   (for python3-appdirs)
* pronsole  (for python3-appdirs)
* ptpython  (for python3-appdirs)
* pydoctor  (for python3-appdirs)
* python3-cobra [amd64 arm64 armel armhf i386 ppc64el]
* python3-datalad   (for python3-appdirs)
* python3-easydev   (for python3-appdirs)
* python3-etesync   (for python3-appdirs)
* python3-fissix(for python3-appdirs)
* python3-fs(for python3-appdirs)
* python3-intake [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el]
* python3-ironicclient  (for python3-appdirs)
* python3-mbed-ls   (for python3-appdirs)
* python3-miio  (for python3-appdirs)
* python3-openstacksdk  (for python3-appdirs)
* python3-os-faults (for python3-appdirs)
* python3-pantalaimon   (for python3-appdirs)
* python3-pycuda [amd64](for python3-appdirs)
* python3-pyopencl [amd64 arm64 armel armhf i386]
* python3-pyspectral(for python3-appdirs)
* python3-pytools   (for python3-appdirs)
* python3-rply  (for python3-appdirs)
* python3-smstrade  (for python3-appdirs)
* python3-subliminal(for python3-appdirs)
* python3-ulmo  (for python3-appdirs)
* python3-virtualenv(for python3-appdirs)
* python3-yowsup(for python3-appdirs)
* python3-zeep  (for python3-appdirs)
* snakemake (for python3-appdirs)
* urlwatch  (for python3-appdirs)
* vorta (for python3-appdirs)

SR

Bug#990812: unblock: python-authlib/0.15.4-1

2021-07-07 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package python-authlib

[ Reason ]
Upstream made a security point release. No CVE.

[ Impact ]
Security vulnerability.

[ Tests ]
Added a unit test to cover the issue.

Package builds and tests pass.

[ Risks ]
Tiny diff, looks good.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock python-authlib/0.15.4-1
diff -Nru python-authlib-0.15.3/authlib/consts.py 
python-authlib-0.15.4/authlib/consts.py
--- python-authlib-0.15.3/authlib/consts.py 2021-01-15 09:51:55.0 
-0400
+++ python-authlib-0.15.4/authlib/consts.py 2021-06-05 03:07:38.0 
-0400
@@ -1,5 +1,5 @@
 name = 'Authlib'
-version = '0.15.3'
+version = '0.15.4'
 author = 'Hsiaoming Yang '
 homepage = 'https://authlib.org/'
 default_user_agent = '{}/{} (+{})'.format(name, version, homepage)
diff -Nru python-authlib-0.15.3/authlib/jose/rfc7519/claims.py 
python-authlib-0.15.4/authlib/jose/rfc7519/claims.py
--- python-authlib-0.15.3/authlib/jose/rfc7519/claims.py2021-01-15 
09:51:55.0 -0400
+++ python-authlib-0.15.4/authlib/jose/rfc7519/claims.py2021-06-05 
03:07:38.0 -0400
@@ -58,10 +58,10 @@
 
 def _validate_claim_value(self, claim_name):
 option = self.options.get(claim_name)
-value = self.get(claim_name)
-if not option or not value:
+if not option:
 return
 
+value = self.get(claim_name)
 option_value = option.get('value')
 if option_value and value != option_value:
 raise InvalidClaimError(claim_name)
diff -Nru python-authlib-0.15.3/debian/changelog 
python-authlib-0.15.4/debian/changelog
--- python-authlib-0.15.3/debian/changelog  2021-01-20 14:21:23.0 
-0400
+++ python-authlib-0.15.4/debian/changelog  2021-07-07 19:32:08.0 
-0400
@@ -1,3 +1,9 @@
+python-authlib (0.15.4-1) unstable; urgency=medium
+
+  * New upstream point release, fixing a security issue.
+
+ -- Stefano Rivera   Wed, 07 Jul 2021 19:32:08 -0400
+
 python-authlib (0.15.3-1) unstable; urgency=medium
 
   [ Stefano Rivera ]
diff -Nru python-authlib-0.15.3/tests/core/test_jose/test_jwt.py 
python-authlib-0.15.4/tests/core/test_jose/test_jwt.py
--- python-authlib-0.15.3/tests/core/test_jose/test_jwt.py  2021-01-15 
09:51:55.0 -0400
+++ python-authlib-0.15.4/tests/core/test_jose/test_jwt.py  2021-06-05 
03:07:38.0 -0400
@@ -73,6 +73,20 @@
 claims.validate,
 )
 
+def test_validate_expected_issuer_received_None(self):
+id_token = jwt.encode({'alg': 'HS256'}, {'iss': None, 'sub': None}, 
'k')
+claims_options = {
+'iss': {
+'essential': True,
+'values': ['foo']
+}
+}
+claims = jwt.decode(id_token, 'k', claims_options=claims_options)
+self.assertRaises(
+errors.InvalidClaimError,
+claims.validate
+)
+
 def test_validate_aud(self):
 id_token = jwt.encode({'alg': 'HS256'}, {'aud': 'foo'}, 'k')
 claims_options = {

Bug#990416: unblock: python-pip/20.3.4-3

2021-07-01 Thread Stefano Rivera

Control: retitle -1 unblock: python-pip/20.3.4-4

Changes:
 python-pip (20.3.4-4) unstable; urgency=medium
 .
   * No-change upload against distlib 0.3.2+really+0.3.1-0.1.

See #990549.

unblock python-pip/20.3.4-4

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#990416: unblock: python-pip/20.3.4-3

2021-07-01 Thread Stefano Rivera

Hrm, the original email got truncated at a "." line. Sounds like some
broken SMTP thing somewhere...

Please unblock package python-pip

python-pip (20.3.4-3) unstable; urgency=medium

  * Modify hands-off-system-packages.patch to act correctly under PyPy3, which
shares dist-packages with cPython, but has a different sys.prefix.

[ Reason ]
PyPy and cPython on Debian share a common dist-packages directory
(/usr/lib/python3/dist-packages). However, not everything in there is
importable in PyPy. Generally C extensions are only built against
cPython.

So, users wanting to use numpy, for example, would pip install it.
However, unless one is very careful, pip will uninstall the numpy from
dist-packages, which should be managed by apt, not pip.

Pip has a patch to avoid this, but it wasn't working correctly under
PyPy, because it assumed sys.prefix == /usr.
This upload hard-codes prefix in the patch, making pip refuse to remove
files from dist-packages, when run under cPython or PyPy.

Bug describing this: https://salsa.debian.org/debian/pypy/-/issues/2

[ Impact ]
Users can fairly easily break their python3-* packages, by using pip as
root, to install modules for pypy3.

[ Tests ]
Manually tested installing & upgrading modules with pip under cpython
and pypy3.

[ Risks ]
Change is a noop on cpython, and fixes a bug on PyPy.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock python-pip/20.3.4-3
diff -Nru python-pip-20.3.4/debian/changelog python-pip-20.3.4/debian/changelog
--- python-pip-20.3.4/debian/changelog  2021-05-12 08:39:26.0 -0400
+++ python-pip-20.3.4/debian/changelog  2021-06-28 12:20:17.0 -0400
@@ -1,3 +1,10 @@
+python-pip (20.3.4-3) unstable; urgency=medium
+
+  * Modify hands-off-system-packages.patch to act correctly under PyPy3, which
+shares dist-packages with cPython, but has a different sys.prefix.
+
+ -- Stefano Rivera   Mon, 28 Jun 2021 12:20:17 -0400
+
 python-pip (20.3.4-2) unstable; urgency=medium
 
   * Add myself to uploaders.
diff -Nru 
python-pip-20.3.4/debian/patches/debian-python2.7-sysconfig-workaround.patch 
python-pip-20.3.4/debian/patches/debian-python2.7-sysconfig-workaround.patch
--- 
python-pip-20.3.4/debian/patches/debian-python2.7-sysconfig-workaround.patch
2021-05-12 08:39:26.0 -0400
+++ 
python-pip-20.3.4/debian/patches/debian-python2.7-sysconfig-workaround.patch
2021-06-28 12:20:17.0 -0400
@@ -37,10 +37,10 @@
  # Use getusersitepackages if this is present, as it ensures that the
  # value is initialised properly.
 diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
-index 706937d..ebe5f29 100644
+index 459312f..b8795cc 100644
 --- a/src/pip/_internal/utils/misc.py
 +++ b/src/pip/_internal/utils/misc.py
-@@ -429,11 +429,7 @@ def dist_is_editable(dist):
+@@ -430,11 +430,7 @@ def dist_is_editable(dist):
  """
  Return True if given Distribution is an editable install.
  """
diff -Nru python-pip-20.3.4/debian/patches/hands-off-system-packages.patch 
python-pip-20.3.4/debian/patches/hands-off-system-packages.patch
--- python-pip-20.3.4/debian/patches/hands-off-system-packages.patch
2021-05-12 08:39:26.0 -0400
+++ python-pip-20.3.4/debian/patches/hands-off-system-packages.patch
2021-06-28 12:20:17.0 -0400
@@ -15,14 +15,14 @@
 
 Patch-Name: hands-off-system-packages.patch
 ---
- src/pip/_internal/utils/misc.py | 36 +++-
- 1 file changed, 27 insertions(+), 9 deletions(-)
+ src/pip/_internal/utils/misc.py | 37 -
+ 1 file changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
-index 4fb64d2..706937d 100644
+index 4fb64d2..459312f 100644
 --- a/src/pip/_internal/utils/misc.py
 +++ b/src/pip/_internal/utils/misc.py
-@@ -365,25 +365,43 @@ def renames(old, new):
+@@ -365,25 +365,44 @@ def renames(old, new):
  def is_local(path):
  # type: (str) -> bool
  """
@@ -48,7 +48,8 @@
 -return path.startswith(normalize_path(sys.prefix))
 +
 +path = normalize_path(path)
-+prefix = normalize_path(sys.prefix)
++# Hard-coded becouse PyPy uses a different sys.prefix on Debian
++prefix = '/usr'
 +
 +if running_under_virtualenv():
 +return path.startswith(normalize_path(sys.prefix))

Bug#990549: unblock: distlib/0.3.2+really+0.3.1-0.1

2021-07-01 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: d...@debian.org
Control: block 990416 with -1

Please unblock package distlib.

[ Reason ]

To migrate python-pip (#990416) which bundles distlib, I need distlib to
migrate. A new upstream point-release had been uploaded to unstable, so
I've reverted it (with Matthias' consent):

distlib (0.3.2+really+0.3.1-0.1) unstable; urgency=medium

  * Non-maintainer upload.
  * Revert to 0.3.1 for Debian bullseye.

 -- Stefano Rivera   Thu, 01 Jul 2021 13:40:03 -0400

distlib (0.3.2-1) unstable; urgency=medium

  * New upstream version.

 -- Matthias Klose   Mon, 21 Jun 2021 10:28:59 +0200

[ Impact ]
This is a noop change.

[ Tests ]
Package builds and autopkgtests pass.

[ Risks ]
This is a noop change.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock distlib/0.3.2+really+0.3.1-0.1
diff -Nru distlib-0.3.1/debian/changelog 
distlib-0.3.2+really+0.3.1/debian/changelog
--- distlib-0.3.1/debian/changelog  2020-07-17 04:20:12.0 -0400
+++ distlib-0.3.2+really+0.3.1/debian/changelog 2021-07-01 13:40:03.0 
-0400
@@ -1,3 +1,16 @@
+distlib (0.3.2+really+0.3.1-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Revert to 0.3.1 for Debian bullseye.
+
+ -- Stefano Rivera   Thu, 01 Jul 2021 13:40:03 -0400
+
+distlib (0.3.2-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Matthias Klose   Mon, 21 Jun 2021 10:28:59 +0200
+
 distlib (0.3.1-1) unstable; urgency=medium
 
   * New upstream version.

Bug#989881: [pre-approval] unblock: python-urllib3/1.26.5-1

2021-06-29 Thread Stefano Rivera

Control: block 990416 with -1

> I'm really sorry unfortunately I made a stupid error, I used `dch -r
> experimental` but it's the wrong syntax and I even did not noticed the URL of
> http://debomatic-amd64.debian.net/distribution#unstable/python-urllib3/1.26.5-1~exp1/buildlog
> because I clicked on the label in the home page... so I unfortunately upload
> urllib3 to unstable :( Yes with the ~exp1...

I was going to ask you to ping me if this unblock was approved, so we
could do a new python-pip upload, bundling this urllib3 in it.
But now I don't need to :)

I have an upload pending unblock that built against
python-urllib3/1.26.5-1~exp1 in bug 990416.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#990416: unblock: python-pip/20.3.4-3

2021-06-28 Thread Stefano Rivera


Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package python-pip

python-pip (20.3.4-3) unstable; urgency=medium

Bug#990297: unblock: pyyaml/5.3.1-5

2021-06-24 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: a...@debian.org

Please unblock package pyyaml

 pyyaml (5.3.1-5) unstable; urgency=medium
 .
   * Team upload.
 .
   [ Andreas Beckmann ]
   * python3-yaml: Copy Breaks: python (<< 2.7.18), python-minimal (<< 2.7.18),
 libpython-stdlib (<< 2.7.18) from python2.7 and add
 Breaks: python-yaml (<< 5.3.1-2) for smoother upgrades from buster.
 In some upgrade scenarios (mostly involving ros-* packages) these Breaks
 in python2.7 were ineffective because the unversioned python packages got
 higher scores. Copying the Breaks to python3-yaml which is the first
 python package scoring higher than the to-be-removed packages solves these
 issues.  (Closes: #989930)

[ Reason ]
Improve upgrades from buster.

[ Impact ]
More manual package upgrades and cleanup required, without this patch.

[ Tests ]

From #989930:
> I've run a lot of upgrade tests and the results look very promising that
> we can improve the number of clean upgrade paths with this patch.

From my PoV, the change seems safe enough. Built and test-installed.

[ Risks ]
Dependency-only change.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock pyyaml/5.3.1-5
diff -Nru pyyaml-5.3.1/debian/changelog pyyaml-5.3.1/debian/changelog
--- pyyaml-5.3.1/debian/changelog   2021-05-21 11:11:00.0 -0400
+++ pyyaml-5.3.1/debian/changelog   2021-06-24 19:02:58.0 -0400
@@ -1,3 +1,19 @@
+pyyaml (5.3.1-5) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Andreas Beckmann ]
+  * python3-yaml: Copy Breaks: python (<< 2.7.18), python-minimal (<< 2.7.18),
+libpython-stdlib (<< 2.7.18) from python2.7 and add
+Breaks: python-yaml (<< 5.3.1-2) for smoother upgrades from buster.
+In some upgrade scenarios (mostly involving ros-* packages) these Breaks
+in python2.7 were ineffective because the unversioned python packages got
+higher scores. Copying the Breaks to python3-yaml which is the first
+python package scoring higher than the to-be-removed packages solves these
+issues.  (Closes: #989930)
+
+ -- Stefano Rivera   Thu, 24 Jun 2021 19:02:58 -0400
+
 pyyaml (5.3.1-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru pyyaml-5.3.1/debian/control pyyaml-5.3.1/debian/control
--- pyyaml-5.3.1/debian/control 2021-05-21 11:11:00.0 -0400
+++ pyyaml-5.3.1/debian/control 2021-06-24 19:02:58.0 -0400
@@ -15,6 +15,11 @@
 Architecture: any
 Multi-Arch: allowed
 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Breaks:
+ python (<< 2.7.18),
+ python-minimal (<< 2.7.18),
+ libpython-stdlib (<< 2.7.18),
+ python-yaml (<< 5.3.1-2),
 Description: YAML parser and emitter for Python3
  Python3-yaml is a complete YAML 1.1 parser and emitter for Python3.  It can
  parse all examples from the specification. The parsing algorithm is simple

Bug#990111: unblock: python-virtualenv/20.4.0+ds-2

2021-06-20 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package python-virtualenv

 python-virtualenv (20.4.0+ds-2) unstable; urgency=medium
 .
   * Patch: Fix --upgrade-embed-wheels.
   * Replace the pkg_resources addition part of
 debian_update_for_available_wheels.patch with include-pkg_resources.patch
 which will only include pkg_resources when using Debian's bundled
 setuptools wheel. (Closes: #976796)

[ Reason ]
The --upgrade-embed-wheels option was not working at all, it would
crash, if you attempted to use it. This was fixed upstream later in
20.4.x, so cherry-picked that trivial patch.

Relatedly, we got to the bottom of #976796, which was caused by upgraded
wheels, which would include pkg_resources in the setuptools wheel
(Debian splits it into its own binary package). This could cause a race
on unpacking, crashing.

[ Impact ]
If a user has an upgraded virtualenv wheel cache, then virtualenv
becomes unreliable, due to a race (two threads unpacking the target
files).

[ Tests ]
Manually tested 4 variants:
--seeder pip before and after --upgrade-embed-wheels
--seeder app-data and after --upgrade-embed-wheels

Autopkgtests verify that the basic functionality is unaffected.

[ Risks ]
The changes are relatively straightforward, and should improve
robustness.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock python-virtualenv/20.4.0+ds-2
diff -Nru python-virtualenv-20.4.0+ds/debian/changelog 
python-virtualenv-20.4.0+ds/debian/changelog
--- python-virtualenv-20.4.0+ds/debian/changelog2021-01-22 
23:40:18.0 -0400
+++ python-virtualenv-20.4.0+ds/debian/changelog2021-06-20 
17:31:30.0 -0400
@@ -1,3 +1,13 @@
+python-virtualenv (20.4.0+ds-2) unstable; urgency=medium
+
+  * Patch: Fix --upgrade-embed-wheels.
+  * Replace the pkg_resources addition part of
+debian_update_for_available_wheels.patch with include-pkg_resources.patch
+which will only include pkg_resources when using Debian's bundled
+setuptools wheel. (Closes: #976796)
+
+ -- Stefano Rivera   Sun, 20 Jun 2021 17:31:30 -0400
+
 python-virtualenv (20.4.0+ds-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru 
python-virtualenv-20.4.0+ds/debian/patches/debian_update_for_available_wheels.patch
 
python-virtualenv-20.4.0+ds/debian/patches/debian_update_for_available_wheels.patch
--- 
python-virtualenv-20.4.0+ds/debian/patches/debian_update_for_available_wheels.patch
 2021-01-22 23:40:18.0 -0400
+++ 
python-virtualenv-20.4.0+ds/debian/patches/debian_update_for_available_wheels.patch
 2021-06-20 17:31:30.0 -0400
@@ -1,42 +1,17 @@
-From: Debian Python Modules Team
- 
-Date: Sat, 21 Mar 2020 03:16:18 -0400
+From: Scott Kitterman 
+Date: Sun, 20 Jun 2021 13:49:30 -0400
 Subject: Update base embed to include pip provided wheels for --no-download
 
 Generate wheel lists and attributes for base install to match pip wheel
 versions and add pkg_resources to the base install for no download.
 
-Author: Scott Kitterman 
 Origin: vendor
 Forwarded: not-needed
 Last-Update: 2020-07-15
 ---
- src/virtualenv/seed/embed/base_embed.py  |  7 ++-
  src/virtualenv/seed/wheels/embed/__init__.py | 15 +++
- 2 files changed, 21 insertions(+), 1 deletion(-)
+ 1 file changed, 15 insertions(+)
 
-diff --git a/src/virtualenv/seed/embed/base_embed.py 
b/src/virtualenv/seed/embed/base_embed.py
-index c794e83..bc9cec8 100644
 a/src/virtualenv/seed/embed/base_embed.py
-+++ b/src/virtualenv/seed/embed/base_embed.py
-@@ -43,11 +43,16 @@ class BaseEmbed(Seeder):
- }
- 
- def distribution_to_versions(self):
--return {
-+dv = {
- distribution: getattr(self, "{}_version".format(distribution))
- for distribution in self.distributions()
- if getattr(self, "no_{}".format(distribution)) is False
- }
-+# Debian specific: Since Debian splits out pkg_resources from
-+# setuptools, for a local virtualenv, we need to add it to the base.
-+if not self.download:
-+dv['pkg_resources'] = None
-+return dv
- 
- @classmethod
- def add_parser_arguments(cls, parser, interpreter, app_data):
 diff --git a/src/virtualenv/seed/wheels/embed/__init__.py 
b/src/virtualenv/seed/wheels/embed/__init__.py
 index f63ec1d..4c1a4a7 100644
 --- a/src/virtualenv/seed/wheels/embed/__init__.py
diff -Nru 
python-virtualenv-20.4.0+ds/debian/patches/disable-periodic-update.patch 
python-virtualenv-20.4.0+ds/debian/patches/disable-periodic-update.patch
--- python-virtualenv-20.4.0+ds/debian/patches/disable-periodic-update.patch
2021-01-22 23:40:18.0 -0400
+++ python-virtualenv-20.4.0+ds/debian/patches/disable-periodic-update.patch
2021-06-20 17:31:30.0 -0400
@

Bug#976796: Sporadically fails to create virtualenv with Python 3.9

2021-06-20 Thread Stefano Rivera

Hi Daniel (2021.06.14_13:48:37_-0400)
> Turns out there is a file
> ~/.local/share/virtualenv/wheel/3.9/embed/1/setuptools.json with the
> following content:
> 
> {
>   "completed": "2021-05-17T17:34:03.491147Z",
>   "periodic": true,
>   "started": "2021-05-17T17:33:59.488436Z",
>   "versions": [
> {
>   "filename": "setuptools-56.2.0-py3-none-any.whl",
>   "found_date": "2021-05-17T17:33:59.597757Z",
>   "release_date": "2021-05-09T17:40:49.00Z"
> },
> {
>   "filename": "setuptools-56.1.0-py3-none-any.whl",
>   "found_date": "2021-05-17T17:34:01.067885Z",
>   "release_date": "2021-05-04T21:35:13.00Z"
> },
> {
>   "filename": "setuptools-56.0.0-py3-none-any.whl",
>   "found_date": "2021-05-17T17:34:02.299115Z",
>   "release_date": "2021-04-09T00:24:04.00Z"
> }
>   ]
> }
> 
> Removing this file causes this problem to go away!

Aha. Yes, that looks like it may be our culprit.

Those setuptools versions are newer than the ones we use in pip in
Debian, we are still using 44.1.1, for compatibility with Python 2.7.
So, those must have come from the Internet.
Setuptools from the internet will also contain pkg_resources, which is a
separate package in Debian.

Which lead me to find the bug in debian_update_for_available_wheels.patch
It assumes that we're only using data from the internet if "--download"
is passed. However, once it has been updated with
"--upgrade-embed-wheels", it'll be used, even without "--download".

Thanks, again!

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#990036: unblock: xdot/1.2-2

2021-06-18 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package xdot

[ Reason ]
Fixing a (non-filed) RC bug - missing dependency on numpy.
https://github.com/zim-desktop-wiki/zim-desktop-wiki/issues/1496

[ Impact ]
The package may not be usable, if the user doesn't have numpy installed,
already.

[ Tests ]
No automated tests.

Manually tested that the package is still installable, and works.

[ Risks ]
Trivial change.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock xdot/1.2-2
diff -Nru xdot-1.2/debian/changelog xdot-1.2/debian/changelog
--- xdot-1.2/debian/changelog   2020-11-23 16:08:19.0 -0400
+++ xdot-1.2/debian/changelog   2021-06-18 10:01:16.0 -0400
@@ -1,3 +1,9 @@
+xdot (1.2-2) unstable; urgency=medium
+
+  * Add missing dependency on python3-numpy, introduced in 1.2.
+
+ -- Stefano Rivera   Fri, 18 Jun 2021 10:01:16 -0400
+
 xdot (1.2-1) unstable; urgency=low
 
   [ Stefano Rivera ]
diff -Nru xdot-1.2/debian/control xdot-1.2/debian/control
--- xdot-1.2/debian/control 2020-11-23 16:08:19.0 -0400
+++ xdot-1.2/debian/control 2021-06-18 10:01:16.0 -0400
@@ -22,6 +22,7 @@
  graphviz,
  python3-gi,
  python3-gi-cairo,
+ python3-numpy,
  ${misc:Depends},
  ${python3:Depends}
 Description: interactive viewer for Graphviz dot files

Bug#989864: unblock: distro-info-data/0.48

2021-06-14 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: bdr...@debian.org

Please unblock package distro-info-data

distro-info-data (0.48) unstable; urgency=medium

  * Correct typo in changelog.
  * Set a release date for Debian bullseye (and bookworm creation), based on
the release team's tentative estimate.

[ Reason ]
We've got a tentative release date, let's roll with it.
If we slip, we can do a follow-up upload.

[ Impact ]
Bullseye will ship with distro-info that doesn't know the current
development release.

[ Tests ]
Data package. With some sanity-check tests.

[ Risks ]
Just a data package.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock distro-info-data/0.48
diff -Nru distro-info-data-0.47/debian/changelog 
distro-info-data-0.48/debian/changelog
--- distro-info-data-0.47/debian/changelog  2021-04-22 10:30:18.0 
-0400
+++ distro-info-data-0.48/debian/changelog  2021-06-14 17:47:09.0 
-0400
@@ -1,6 +1,14 @@
+distro-info-data (0.48) unstable; urgency=medium
+
+  * Correct typo in changelog.
+  * Set a release date for Debian bullseye (and bookworm creation), based on
+the release team's tentative estimate.
+
+ -- Stefano Rivera   Mon, 14 Jun 2021 17:47:09 -0400
+
 distro-info-data (0.47) unstable; urgency=medium
 
-  * Add Ubuntu 21.04, Impish Indri.
+  * Add Ubuntu 21.10, Impish Indri.
 
  -- Stefano Rivera   Thu, 22 Apr 2021 10:30:18 -0400
 
diff -Nru distro-info-data-0.47/debian.csv distro-info-data-0.48/debian.csv
--- distro-info-data-0.47/debian.csv2021-04-22 10:30:18.0 -0400
+++ distro-info-data-0.48/debian.csv2021-06-14 17:47:09.0 -0400
@@ -14,8 +14,8 @@
 8,Jessie,jessie,2013-05-04,2015-04-25,2018-06-17,2020-06-30,2022-06-30
 9,Stretch,stretch,2015-04-25,2017-06-17,2020-07-06,2022-06-30
 10,Buster,buster,2017-06-17,2019-07-06,2022-07-06,2024-06-30
-11,Bullseye,bullseye,2019-07-06
-12,Bookworm,bookworm,2021-08-01
+11,Bullseye,bullseye,2019-07-06,2021-07-31,2024-07-31
+12,Bookworm,bookworm,2021-07-31
 13,Trixie,trixie,2023-08-01
 ,Sid,sid,1993-08-16
 ,Experimental,experimental,1993-08-16

Bug#976796: Sporadically fails to create virtualenv with Python 3.9

2021-06-14 Thread Stefano Rivera

Hi Daniel (2021.06.14_01:38:54_-0400)
> I just ran into the exact same bug. For me it happens around 50% of the times 
> I try to create a virtualenv.

I wish I was able to reproduce this. Is there any chance you can
reproduce it in a VM or controlled environment that I can try to
recreate?

It shouldn't matter, but what filesystem is this on?

Thanks,

SR

> 
> The version of python3-virtualenv installed is 20.4.0+ds-1.
> 
> Daniel
> 
> -- System Information:
> Debian Release: 11.0
>   APT prefers unstable
>   APT policy: (500, 'unstable')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
> 
> Kernel: Linux 5.10.0-7-amd64 (SMP w/12 CPU threads)
> Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
> Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE not 
> set
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
> LSM: AppArmor: enabled
> 
> Versions of packages python3-virtualenv depends on:
> ii  python-pip-whl  20.3.4-2
> ii  python3 3.9.2-3
> ii  python3-appdirs 1.4.4-1
> ii  python3-distlib 0.3.1-1
> ii  python3-distutils   3.9.2-1
> ii  python3-filelock3.0.12-2
> ii  python3-importlib-metadata  1.6.0-2
> ii  python3-pip 20.3.4-2
> ii  python3-pkg-resources   52.0.0-3
> ii  python3-six 1.16.0-1
> 
> python3-virtualenv recommends no packages.
> 
> python3-virtualenv suggests no packages.
> 
> -- no debconf information

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#988716: platformio 4.3.4 cannot download required frameworks

2021-05-31 Thread Stefano Rivera

Hi Sebastian (2021.05.18_10:34:31_-0400)
> Upstream changed paths for the framework manifest files in recent
> releases and did not maintain backward compatibility links resulting
> in 4.3.4 no longer being able to install the frameworks.

Had a quick look, and it's worse than that. Not just a change in paths,
but an entire new package manager, with a new API (/v2/ in the URLs).

Changelog: 
https://github.com/platformio/platformio-core/blob/master/HISTORY.rst#500-2020-09-03
Some relevant history here: 
https://github.com/platformio/platformio-core/commits/59b02120b648a41965974f27ac0b6c5d44dd11d3/platformio/package/manager/platform.py

> This means the package is basically unusable for new installations
> Since it did not exist in buster, it is always a new installation
> in bullseye. Considering we are in late freeze phase I suggest to
> drop the package from Debian testing (and upload a new upstream
> release to sid).

Sounds like the right call.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#989216: unblock: python-ddt/1.4.1-2.1

2021-05-28 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-CC: Thomas Goirand 

Please unblock package python-ddt

Changes:
 python-ddt (1.4.1-2.1) unstable; urgency=medium
 .
   * Non-maintainer upload.
   * Patch: Support pyyaml's security patch in 5.3.1-4 (from 5.4 upstream).
 (Closes: #989009)

[ Reason ]
Updated python-ddt to build-against pyyaml's recent security update
(#988926)

[ Impact ]
Fixes FTBFS with the new pyyaml.

[ Tests ]
The affected code is the test suite.

[ Risks ]
Change is from upstream, affecting only unit tests, so negligible.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock python-ddt/1.4.1-2.1
diff -Nru python-ddt-1.4.1/debian/changelog python-ddt-1.4.1/debian/changelog
--- python-ddt-1.4.1/debian/changelog   2020-10-14 04:11:28.0 -0400
+++ python-ddt-1.4.1/debian/changelog   2021-05-23 11:51:10.0 -0400
@@ -1,3 +1,11 @@
+python-ddt (1.4.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Support pyyaml's security patch in 5.3.1-4 (from 5.4 upstream).
+(Closes: #989009)
+
+ -- Stefano Rivera   Sun, 23 May 2021 11:51:10 -0400
+
 python-ddt (1.4.1-2) unstable; urgency=medium
 
   * Uploading to unstable.
diff -Nru python-ddt-1.4.1/debian/patches/pyyaml-unsafeloader.patch 
python-ddt-1.4.1/debian/patches/pyyaml-unsafeloader.patch
--- python-ddt-1.4.1/debian/patches/pyyaml-unsafeloader.patch   1969-12-31 
20:00:00.0 -0400
+++ python-ddt-1.4.1/debian/patches/pyyaml-unsafeloader.patch   2021-05-23 
11:50:57.0 -0400
@@ -0,0 +1,56 @@
+From 97f0a2315736e50f1b34a015447cd751da66ecb6 Mon Sep 17 00:00:00 2001
+From: Dirk Mueller 
+Date: Mon, 25 Jan 2021 22:49:04 +0100
+Subject: [PATCH] Use Yaml's UnsafeLoader for Python embedding tests
+
+In newer PyYAML versions the default FullLoader has
+python/object/* integration removed. One has to use
+UnsafeLoader instead. see this issue for details:
+
+https://github.com/yaml/pyyaml/issues/321
+Bug-Debian: https://bugs.debian.org/989009
+---
+ test/test_example.py|  2 +-
+ test/test_functional.py | 10 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+--- a/test/test_example.py
 b/test/test_example.py
+@@ -151,7 +151,7 @@
+ 
+ @ddt
+ class YamlOnlyTestCase(unittest.TestCase):
+-@file_data('data/test_custom_yaml_loader.yaml', yaml.FullLoader)
++@file_data('data/test_custom_yaml_loader.yaml', yaml.UnsafeLoader)
+ def test_custom_yaml_loader(self, instance, expected):
+ """Test with yaml tags to create specific classes to compare"""
+ self.assertEqual(expected, instance)
+--- a/test/test_functional.py
 b/test/test_functional.py
+@@ -427,7 +427,7 @@
+ loader allowing python tags is passed.
+ """
+ 
+-from yaml import FullLoader
++from yaml import UnsafeLoader
+ from yaml.constructor import ConstructorError
+ 
+ def str_to_type(class_name):
+@@ -444,13 +444,13 @@
+ raise AssertionError()
+ 
+ @ddt
+-class YamlFullLoaderTest(object):
+-@file_data('data/test_functional_custom_tags.yaml', FullLoader)
++class YamlUnsafeLoaderTest(object):
++@file_data('data/test_functional_custom_tags.yaml', UnsafeLoader)
+ def test_cls_is_instance(self, instance, expected):
+ assert isinstance(instance, str_to_type(expected))
+ 
+-tests = list(filter(_is_test, YamlFullLoaderTest.__dict__))
+-obj = YamlFullLoaderTest()
++tests = list(filter(_is_test, YamlUnsafeLoaderTest.__dict__))
++obj = YamlUnsafeLoaderTest()
+ 
+ if not tests:
+ raise AssertionError('No tests have been found.')
diff -Nru python-ddt-1.4.1/debian/patches/series 
python-ddt-1.4.1/debian/patches/series
--- python-ddt-1.4.1/debian/patches/series  1969-12-31 20:00:00.0 
-0400
+++ python-ddt-1.4.1/debian/patches/series  2021-05-23 11:50:33.0 
-0400
@@ -0,0 +1 @@
+pyyaml-unsafeloader.patch

Bug#988967: unblock: mercurial/5.6.1-3

2021-05-24 Thread Stefano Rivera

Control: retitle -1 unblock: mercurial/5.6.1-4

Made one more change to get a build on mips64el:

mercurial (5.6.1-4) unstable; urgency=medium

  * Revert -mno-lra workaround on mips64el, #871514 was fixed. Fixes
occasional FTBFS on mips64el.

 -- Stefano Rivera   Sun, 23 May 2021 08:37:06 -0400

It has now built on all release architectures.

diff --git a/debian/rules b/debian/rules
index 49272a8e..d6a5d5bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,6 @@
 PYVERS=$(shell py3versions -vs)
 PYVER_DEFAULT=$(shell py3versions -vd)
 include /usr/share/dpkg/architecture.mk
-ifeq ($(DEB_HOST_ARCH),mips64el)
-# Work around #871514
-export DEB_CFLAGS_MAINT_APPEND = -mno-lra
-endif
 
 override_dh_python3:
dh_python3 --shebang=/usr/bin/python3

unblock mercurial/5.6.1-4

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#989009: python-ddt: diff for NMU version 1.4.1-2.1

2021-05-23 Thread Stefano Rivera

Control: tags 989009 + pending


Dear maintainer,

I've prepared an NMU for python-ddt (versioned as 1.4.1-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

SR
diff -Nru python-ddt-1.4.1/debian/changelog python-ddt-1.4.1/debian/changelog
--- python-ddt-1.4.1/debian/changelog	2020-10-14 04:11:28.0 -0400
+++ python-ddt-1.4.1/debian/changelog	2021-05-23 11:51:10.0 -0400
@@ -1,3 +1,11 @@
+python-ddt (1.4.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Support pyyaml's security patch in 5.3.1-4 (from 5.4 upstream).
+(Closes: #989009)
+
+ -- Stefano Rivera   Sun, 23 May 2021 11:51:10 -0400
+
 python-ddt (1.4.1-2) unstable; urgency=medium
 
   * Uploading to unstable.
diff -Nru python-ddt-1.4.1/debian/patches/pyyaml-unsafeloader.patch python-ddt-1.4.1/debian/patches/pyyaml-unsafeloader.patch
--- python-ddt-1.4.1/debian/patches/pyyaml-unsafeloader.patch	1969-12-31 20:00:00.0 -0400
+++ python-ddt-1.4.1/debian/patches/pyyaml-unsafeloader.patch	2021-05-23 11:50:57.0 -0400
@@ -0,0 +1,56 @@
+From 97f0a2315736e50f1b34a015447cd751da66ecb6 Mon Sep 17 00:00:00 2001
+From: Dirk Mueller 
+Date: Mon, 25 Jan 2021 22:49:04 +0100
+Subject: [PATCH] Use Yaml's UnsafeLoader for Python embedding tests
+
+In newer PyYAML versions the default FullLoader has
+python/object/* integration removed. One has to use
+UnsafeLoader instead. see this issue for details:
+
+https://github.com/yaml/pyyaml/issues/321
+Bug-Debian: https://bugs.debian.org/989009
+---
+ test/test_example.py|  2 +-
+ test/test_functional.py | 10 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+--- a/test/test_example.py
 b/test/test_example.py
+@@ -151,7 +151,7 @@
+ 
+ @ddt
+ class YamlOnlyTestCase(unittest.TestCase):
+-@file_data('data/test_custom_yaml_loader.yaml', yaml.FullLoader)
++@file_data('data/test_custom_yaml_loader.yaml', yaml.UnsafeLoader)
+ def test_custom_yaml_loader(self, instance, expected):
+ """Test with yaml tags to create specific classes to compare"""
+ self.assertEqual(expected, instance)
+--- a/test/test_functional.py
 b/test/test_functional.py
+@@ -427,7 +427,7 @@
+ loader allowing python tags is passed.
+ """
+ 
+-from yaml import FullLoader
++from yaml import UnsafeLoader
+ from yaml.constructor import ConstructorError
+ 
+ def str_to_type(class_name):
+@@ -444,13 +444,13 @@
+ raise AssertionError()
+ 
+ @ddt
+-class YamlFullLoaderTest(object):
+-@file_data('data/test_functional_custom_tags.yaml', FullLoader)
++class YamlUnsafeLoaderTest(object):
++@file_data('data/test_functional_custom_tags.yaml', UnsafeLoader)
+ def test_cls_is_instance(self, instance, expected):
+ assert isinstance(instance, str_to_type(expected))
+ 
+-tests = list(filter(_is_test, YamlFullLoaderTest.__dict__))
+-obj = YamlFullLoaderTest()
++tests = list(filter(_is_test, YamlUnsafeLoaderTest.__dict__))
++obj = YamlUnsafeLoaderTest()
+ 
+ if not tests:
+ raise AssertionError('No tests have been found.')
diff -Nru python-ddt-1.4.1/debian/patches/series python-ddt-1.4.1/debian/patches/series
--- python-ddt-1.4.1/debian/patches/series	1969-12-31 20:00:00.0 -0400
+++ python-ddt-1.4.1/debian/patches/series	2021-05-23 11:50:33.0 -0400
@@ -0,0 +1 @@
+pyyaml-unsafeloader.patch

Bug#988998: lava: diff for NMU version 2020.12-4.1

2021-05-23 Thread Stefano Rivera

Control: tags 988998 + pending

Dear maintainer,

I've prepared an NMU for lava (versioned as 2020.12-4.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards,

SR
diff -Nru lava-2020.12/debian/changelog lava-2020.12/debian/changelog
--- lava-2020.12/debian/changelog	2021-05-12 09:34:00.0 -0400
+++ lava-2020.12/debian/changelog	2021-05-23 11:34:54.0 -0400
@@ -1,3 +1,11 @@
+lava (2020.12-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: Support pyyaml's security patch in 5.3.1-4 (from 5.4 upstream).
+(Closes: #988998)
+
+ -- Stefano Rivera   Sun, 23 May 2021 11:34:54 -0400
+
 lava (2020.12-4) unstable; urgency=medium
 
   * Reinstate /etc/logrotate.d/lava-scheduler-log with the original contents
diff -Nru lava-2020.12/debian/patches/0002-Add-yaml_unsafe_load.patch lava-2020.12/debian/patches/0002-Add-yaml_unsafe_load.patch
--- lava-2020.12/debian/patches/0002-Add-yaml_unsafe_load.patch	1969-12-31 20:00:00.0 -0400
+++ lava-2020.12/debian/patches/0002-Add-yaml_unsafe_load.patch	2021-05-23 11:34:51.0 -0400
@@ -0,0 +1,90 @@
+From f09a08701539cf022f7507e376f26d2a3229a607 Mon Sep 17 00:00:00 2001
+From: Marc Deslauriers 
+Date: Sun, 23 May 2021 11:18:22 -0400
+Subject: [PATCH] Add yaml_unsafe_load
+
+And use it in test as some constructiors were removed in pyyaml security update
+
+Bug-Debian: https://bugs.debian.org/988998
+Forwarded: https://git.lavasoftware.org/lava/lava/-/issues/488
+
+---
+ lava_common/compat.py | 9 +
+ tests/lava_dispatcher/test_multinode.py   | 4 ++--
+ tests/lava_scheduler_app/test_pipeline.py | 4 ++--
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/lava_common/compat.py b/lava_common/compat.py
+index dd35282fc..c8c981701 100644
+--- a/lava_common/compat.py
 b/lava_common/compat.py
+@@ -45,6 +45,10 @@ try:
+ from yaml import CSafeLoader as SafeLoader
+ except ImportError:
+ from yaml import SafeLoader
++try:
++from yaml import CUnsafeLoader as UnsafeLoader
++except ImportError:
++from yaml import UnsafeLoader
+ try:
+ from yaml import CSafeDumper as SafeDumper
+ except ImportError:
+@@ -65,6 +69,11 @@ def yaml_safe_load(data):
+ return yaml.load(data, Loader=SafeLoader)
+ 
+ 
++# handle compatibility for yaml.unsafe_load
++def yaml_unsafe_load(data):
++return yaml.load(data, Loader=UnsafeLoader)
++
++
+ # handle compatibility for yaml.dump
+ def yaml_dump(data, *args, **kwargs):
+ return yaml.dump(data, *args, Dumper=Dumper, **kwargs)
+diff --git a/tests/lava_dispatcher/test_multinode.py b/tests/lava_dispatcher/test_multinode.py
+index fee427cdd..e7a96b117 100644
+--- a/tests/lava_dispatcher/test_multinode.py
 b/tests/lava_dispatcher/test_multinode.py
+@@ -23,7 +23,7 @@ import os
+ import uuid
+ import json
+ 
+-from lava_common.compat import yaml_dump, yaml_load
++from lava_common.compat import yaml_dump, yaml_unsafe_load
+ from lava_common.constants import LAVA_MULTINODE_SYSTEM_TIMEOUT
+ from lava_common.timeout import Timeout
+ from lava_common.exceptions import TestError, JobError, InfrastructureError
+@@ -283,7 +283,7 @@ class TestMultinode(StdoutTestCase):
+ for action in self.client_job.pipeline.actions:
+ data = action.explode()
+ data_str = yaml_dump(data)
+-yaml_load(data_str)  # nosec not suitable for safe_load
++yaml_unsafe_load(data_str)  # nosec not suitable for safe_load
+ 
+ def test_multinode_timeout(self):
+ """
+diff --git a/tests/lava_scheduler_app/test_pipeline.py b/tests/lava_scheduler_app/test_pipeline.py
+index 1f58dfba5..3cc058dfa 100644
+--- a/tests/lava_scheduler_app/test_pipeline.py
 b/tests/lava_scheduler_app/test_pipeline.py
+@@ -26,7 +26,7 @@ from lava_scheduler_app.schema import (
+ SubmissionException,
+ )
+ 
+-from lava_common.compat import yaml_load
++from lava_common.compat import yaml_unsafe_load
+ from lava_dispatcher.device import PipelineDevice
+ from lava_dispatcher.parser import JobParser
+ from tests.lava_dispatcher.test_defs import check_missing_path
+@@ -1127,7 +1127,7 @@ class TestYamlMultinode(TestCaseWithFactory):
+ meta_dict,
+ )
+ # simulate dynamic connection
+-dynamic = yaml_load(  # nosec - not suitable for safe_load
++dynamic = yaml_unsafe_load(  # nosec - not suitable for safe_load
+ open(
+ os.path.join(
+ os.path.dirname(__file__),
+-- 
+2.30.2
+
diff -Nru lava-2020.12/debian/patches/series lava-2020.12/debian/patches/series
--- lava-2020.12/debian/patches/series	2021-05-12 09:34:00.0 -0400
+++ lava-2020.12/debian/patches/series	2021-05-23 11:34:10.0 -0400
@@ -1 +1,2 @@
 0001-lava_rest_app-fix-field-name-in-filters.patch
+0002-Add-yaml_unsafe_load.patch

Bug#988998: lava: autopkgtest needs update for new version of pyyaml

2021-05-22 Thread Stefano Rivera

Hi Paul (2021.05.22_15:22:35_-0400)
> Currently this regression is blocking the migration of pyyaml to testing
> [1]. Of course, pyyaml shouldn't just break your autopkgtest (or even
> worse, your package), but it seems to me that the change in pyyaml was
> intended and your package needs to update to the new situation.

Yeah, intended. The unsafe load functions in pyyaml had some obvious
remote code execution paths blocked, by disabling loading some types of
Python object.

That's a backwards-incompatible change, but made for security reasons.

Back-story in: 
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

The Ubuntu patch is the minimal solution to the problem. Replacing
.load() with .unsafe_load() or Loader=UnsafeLoader.

Ideally, anything that handles untrusted input (not sure if that's an
issue in Lava) should use the safe load functions. But those can't load
all types of object.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#988967: unblock: mercurial/5.6.1-3

2021-05-21 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Tristan Seligmann , Julien Cristau 


Please unblock package mercurial

mercurial (5.6.1-3) unstable; urgency=medium

  * Team upload.

  [ Helmut Grohne ]
  * Annotate test dependencies  (closes: #980337).

  [ Stefano Rivera ]
  * python-3.9.2.patch: Use "&" instead of ";" as query string separator
in test-archive.t to fix FTBFS with Python 3.9.2, which changed its
urllib.parse.parse_qsl() behavior to only accept "&" as a separator by
default. (closes: #986514)

 -- Stefano Rivera   Fri, 21 May 2021 12:06:47 -0400

[ Reason ]
Fixes FTBFS with Python 3.9.2+. See #986514

[ Impact ]
FTBFS + autopkgtest failure.

[ Tests ]
It's a test change (and marking dependencies )

[ Risks ]
Patch is from upstream, and Ubuntu has carried it for a month, without
issue.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock mercurial/5.6.1-3
diff -Nru mercurial-5.6.1/debian/changelog mercurial-5.6.1/debian/changelog
--- mercurial-5.6.1/debian/changelog2021-02-01 12:47:09.0 -0400
+++ mercurial-5.6.1/debian/changelog2021-05-21 12:06:47.0 -0400
@@ -1,3 +1,18 @@
+mercurial (5.6.1-3) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Helmut Grohne ]
+  * Annotate test dependencies  (closes: #980337).
+
+  [ Stefano Rivera ]
+  * python-3.9.2.patch: Use "&" instead of ";" as query string separator
+in test-archive.t to fix FTBFS with Python 3.9.2, which changed its
+urllib.parse.parse_qsl() behavior to only accept "&" as a separator by
+default. (closes: #986514)
+
+ -- Stefano Rivera   Fri, 21 May 2021 12:06:47 -0400
+
 mercurial (5.6.1-2) unstable; urgency=medium
 
   * tests: make test-subrepo-git.t compatible with git's master->main
diff -Nru mercurial-5.6.1/debian/control mercurial-5.6.1/debian/control
--- mercurial-5.6.1/debian/control  2021-02-01 12:39:12.0 -0400
+++ mercurial-5.6.1/debian/control  2021-05-21 12:06:47.0 -0400
@@ -10,14 +10,14 @@
  debhelper-compat (= 13),
  dh-python,
  gettext,
- netbase,
- patchutils (>= 0.2.25),
+ netbase ,
+ patchutils (>= 0.2.25) ,
  python3-all-dev,
  python3-docutils,
  python3-roman,
- rename,
- unzip,
- zip,
+ rename ,
+ unzip ,
+ zip ,
  less ,
 Standards-Version: 4.5.0
 Homepage: https://www.mercurial-scm.org/
diff -Nru mercurial-5.6.1/debian/patches/python-3.9.2.patch 
mercurial-5.6.1/debian/patches/python-3.9.2.patch
--- mercurial-5.6.1/debian/patches/python-3.9.2.patch   1969-12-31 
20:00:00.0 -0400
+++ mercurial-5.6.1/debian/patches/python-3.9.2.patch   2021-05-21 
12:06:47.0 -0400
@@ -0,0 +1,34 @@
+From: Martin von Zweigbergk 
+Date: Fri, 21 May 2021 12:03:33 -0400
+Subject: tests: make test-archive.t pass on py3.9 (issue6504)
+
+Something got stricter at parsing URL query parameters and now the
+parameters need to be separated by "&"; ";" is no longer allowed. See
+issue6504 for details.
+
+Differential Revision: https://phab.mercurial-scm.org/D10472
+
+Origin: upstream, https://www.mercurial-scm.org/repo/hg/rev/dc8976cc3a6e
+Bug-Debian: https://bugs.debian.org/986514
+Bug-upstream: https://bz.mercurial-scm.org/show_bug.cgi?id=6504
+---
+ tests/test-archive.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-archive.t b/tests/test-archive.t
+index 606c9e2..384a04a 100644
+--- a/tests/test-archive.t
 b/tests/test-archive.t
+@@ -334,10 +334,10 @@ invalid arch type should give 404
+   > pass
+   > if len(sys.argv) <= 3:
+   > node, archive = sys.argv[1:]
+-  > requeststr = 'cmd=archive;node=%s;type=%s' % (node, archive)
++  > requeststr = 'cmd=archive=%s=%s' % (node, archive)
+   > else:
+   > node, archive, file = sys.argv[1:]
+-  > requeststr = 'cmd=archive;node=%s;type=%s;file=%s' % (node, archive, 
file)
++  > requeststr = 'cmd=archive=%s=%s=%s' % (node, archive, 
file)
+   > try:
+   > stdout = sys.stdout.buffer
+   > except AttributeError:
diff -Nru mercurial-5.6.1/debian/patches/series 
mercurial-5.6.1/debian/patches/series
--- mercurial-5.6.1/debian/patches/series   2021-02-01 12:46:24.0 
-0400
+++ mercurial-5.6.1/debian/patches/series   2021-05-21 12:06:47.0 
-0400
@@ -4,3 +4,4 @@
 deb_specific__optional-dependencies
 deb_specific__disable_libdir_replacement.patch
 0005-Tolerate-SIGINT-getting-the-kill-in-test-stdio.py.patch
+python-3.9.2.patch

Bug#987816: dask.distributed: FTBFS due to a build-time test failure

2021-05-21 Thread Stefano Rivera

Control: tag -1 + unreproducible
Control: forwarded -1 https://github.com/dask/distributed/issues/4839

Hi Andrej (2021.04.30_05:27:41_-0400)
> While rebuilding your package for Apertis, I found that it fails to
> build because a few of the build-time tests fail. I rebuilt the package
> in Debian and received the same result.

> __ test_process_time 
> ___
> ___ test_thread_time 
> ___

I tried to reproduce this, twice, and these tests passed, no FTBFS.

The particular numbers in those tests look like they were pulled out of
thin air.

I do however see test failures in the autopkgtest, which are somewhat
flaky.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#988961: unblock: python-libnacl/1.7.2-3

2021-05-21 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Colin Watson 

Please unblock package python-libnacl

python-libnacl (1.7.2-3) unstable; urgency=medium

  * Team upload.
  * Patch: Fix crypto_kdf_derive_from_key() on 32-bit platforms.
(Closes: #988102)

 -- Stefano Rivera   Fri, 21 May 2021 16:35:48 -0400

[ Reason ]
Fixes a crash on 32bit platforms.

[ Impact ]
libnacl's KDF is broken on 32bit platforms.

[ Tests ]
The test suite covers the affected code. Test-built (running the test
suite) on i386 and armhf.

[ Risks ]
Trivial change.

Patch is carried by Gentoo, too.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock python-libnacl/1.7.2-3
diff -Nru python-libnacl-1.7.2/debian/changelog 
python-libnacl-1.7.2/debian/changelog
--- python-libnacl-1.7.2/debian/changelog   2020-11-14 08:40:57.0 
-0400
+++ python-libnacl-1.7.2/debian/changelog   2021-05-21 16:35:48.0 
-0400
@@ -1,3 +1,11 @@
+python-libnacl (1.7.2-3) unstable; urgency=medium
+
+  * Team upload.
+  * Patch: Fix crypto_kdf_derive_from_key() on 32-bit platforms.
+(Closes: #988102)
+
+ -- Stefano Rivera   Fri, 21 May 2021 16:35:48 -0400
+
 python-libnacl (1.7.2-2) unstable; urgency=medium
 
   * Add Breaks: python3-duniterpy (<< 0.60.1) (see #974655).
diff -Nru python-libnacl-1.7.2/debian/.gitignore 
python-libnacl-1.7.2/debian/.gitignore
--- python-libnacl-1.7.2/debian/.gitignore  2020-11-14 08:40:57.0 
-0400
+++ python-libnacl-1.7.2/debian/.gitignore  1969-12-31 20:00:00.0 
-0400
@@ -1,6 +0,0 @@
-*.debhelper*
-*.substvars
-debhelper-build-stamp
-files
-python-libnacl
-python3-libnacl
diff -Nru python-libnacl-1.7.2/debian/patches/32bit-kdf.patch 
python-libnacl-1.7.2/debian/patches/32bit-kdf.patch
--- python-libnacl-1.7.2/debian/patches/32bit-kdf.patch 1969-12-31 
20:00:00.0 -0400
+++ python-libnacl-1.7.2/debian/patches/32bit-kdf.patch 2021-05-21 
16:35:48.0 -0400
@@ -0,0 +1,24 @@
+From: =?utf-8?b?TWljaGHFgiBHw7Nybnk=?= 
+Date: Fri, 21 May 2021 16:25:27 -0400
+Subject: Fix crypto_kdf_derive_from_key() on 32-bit platforms
+
+Bug-Upstream: https://github.com/saltstack/libnacl/issues/126
+Bug-Debian: https://bugs.debian.org/988102
+Forwarded: https://github.com/saltstack/libnacl/pull/130
+---
+ libnacl/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnacl/__init__.py b/libnacl/__init__.py
+index 98a53d9..f799b23 100644
+--- a/libnacl/__init__.py
 b/libnacl/__init__.py
+@@ -1195,7 +1195,7 @@ def crypto_kdf_derive_from_key(subkey_size, subkey_id, 
context, master_key):
+ """
+ size = int(subkey_size)
+ buf = ctypes.create_string_buffer(size)
+-nacl.crypto_kdf_derive_from_key(buf, subkey_size, subkey_id, context, 
master_key)
++nacl.crypto_kdf_derive_from_key(buf, subkey_size, 
ctypes.c_ulonglong(subkey_id), context, master_key)
+ return buf.raw
+ 
+ 
diff -Nru python-libnacl-1.7.2/debian/patches/series 
python-libnacl-1.7.2/debian/patches/series
--- python-libnacl-1.7.2/debian/patches/series  1969-12-31 20:00:00.0 
-0400
+++ python-libnacl-1.7.2/debian/patches/series  2021-05-21 16:35:48.0 
-0400
@@ -0,0 +1 @@
+32bit-kdf.patch

Bug#988960: unblock: eclipse-titan/7.2.0-1.1

2021-05-21 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Gergely Pilisi 

Please unblock package eclipse-titan

eclipse-titan (7.2.0-1.1) unstable; urgency=medium

  * Non-maintainer upload.
  * Re-instate the --no-parallel option, fixing FTBFS on multi-core machines.
(Closes: #987646)

 -- Stefano Rivera   Fri, 21 May 2021 14:58:09 -0400

[ Reason ]
Fixes FTBFS.

[ Impact ]
Expecting auto-removal, if not granted.

[ Tests ]
FTBFS without this change, for me. Doesn't with it.

[ Risks ]
Nothing significant.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock eclipse-titan/7.2.0-1.1
diff -Nru eclipse-titan-7.2.0/debian/changelog 
eclipse-titan-7.2.0/debian/changelog
--- eclipse-titan-7.2.0/debian/changelog2021-02-16 05:25:17.0 
-0400
+++ eclipse-titan-7.2.0/debian/changelog2021-05-21 14:58:09.0 
-0400
@@ -1,3 +1,11 @@
+eclipse-titan (7.2.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Re-instate the --no-parallel option, fixing FTBFS on multi-core machines.
+(Closes: #987646)
+
+ -- Stefano Rivera   Fri, 21 May 2021 14:58:09 -0400
+
 eclipse-titan (7.2.0-1) unstable; urgency=medium
 
   * New release.
diff -Nru eclipse-titan-7.2.0/debian/rules eclipse-titan-7.2.0/debian/rules
--- eclipse-titan-7.2.0/debian/rules2021-02-16 05:20:17.0 -0400
+++ eclipse-titan-7.2.0/debian/rules2021-05-21 14:48:25.0 -0400
@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-   dh $@ --verbose
+   dh $@ --verbose --no-parallel
 
 override_dh_shlibdeps:
dh_shlibdeps -l$(CURDIR)/Install/lib

Bug#988957: unblock: pydantic/1.7.4-1

2021-05-21 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Michael Banck 

Please unblock package pydantic

pydantic (1.7.4-1) unstable; urgency=medium

  * Team upload.
  * New upstream point release.
- Fixes CVE-2021-29510: Date and datetime parsing could cause an infinite
  loop by passing either 'infinity' or float('inf') (Closes: #988480)
  * Update watch file to version 4 with current uscan(1) recommended regex.

 -- Stefano Rivera   Fri, 21 May 2021 16:05:17 -0400

[ Reason ]
New upstream point release, with (only) a security fix (DoS).

[ Impact ]
Without this patch, pydantic can be DoSed with "infinity" as a
timestamp.

[ Tests ]
Upstream unit test suite runs during the package build.
There are unit tests for the changes in this release.

[ Risks ]
Upstream maintains support branches, and provided this point release. So
we're not relying on any untested patches.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock pydantic/1.7.4-1
diff -Nru pydantic-1.7.3/debian/changelog pydantic-1.7.4/debian/changelog
--- pydantic-1.7.3/debian/changelog 2021-01-08 03:31:43.0 -0400
+++ pydantic-1.7.4/debian/changelog 2021-05-21 16:05:17.0 -0400
@@ -1,3 +1,13 @@
+pydantic (1.7.4-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream point release.
+- Fixes CVE-2021-29510: Date and datetime parsing could cause an infinite
+  loop by passing either 'infinity' or float('inf') (Closes: #988480)
+  * Update watch file to version 4 with current uscan(1) recommended regex.
+
+ -- Stefano Rivera   Fri, 21 May 2021 16:05:17 -0400
+
 pydantic (1.7.3-1) unstable; urgency=medium
 
   [ Sandro Tosi ]
diff -Nru pydantic-1.7.3/debian/watch pydantic-1.7.4/debian/watch
--- pydantic-1.7.3/debian/watch 2021-01-08 03:31:43.0 -0400
+++ pydantic-1.7.4/debian/watch 2021-05-21 16:05:17.0 -0400
@@ -1,2 +1,4 @@
-version=3
-https://github.com/samuelcolvin/pydantic/releases .*/archive/v([\d.]+)\.tar\.gz
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \
+https://github.com/samuelcolvin/pydantic/releases \
+(?:.*?/)?v?(\d[\d.]*)\.tar\.gz
diff -Nru pydantic-1.7.3/.github/workflows/ci.yml 
pydantic-1.7.4/.github/workflows/ci.yml
--- pydantic-1.7.3/.github/workflows/ci.yml 2020-11-30 19:33:24.0 
-0400
+++ pydantic-1.7.4/.github/workflows/ci.yml 2021-05-11 15:04:58.0 
-0400
@@ -80,20 +80,20 @@
 COMPILED: yes
 DEPS: yes
 
-- name: uninstall deps
-  run: pip uninstall -y cython email-validator typing-extensions devtools 
python-dotenv
-
-- name: test compiled without deps
-  run: make test
-
-- run: coverage xml
-- uses: codecov/codecov-action@v1.0.14
-  with:
-file: ./coverage.xml
-env_vars: COMPILED,DEPS,PYTHON,OS
-  env:
-COMPILED: yes
-DEPS: no
+#- name: uninstall deps
+#  run: pip uninstall -y cython email-validator typing-extensions devtools 
python-dotenv
+#
+#- name: test compiled without deps
+#  run: make test
+#
+#- run: coverage xml
+#- uses: codecov/codecov-action@v1.0.14
+#  with:
+#file: ./coverage.xml
+#env_vars: COMPILED,DEPS,PYTHON,OS
+#  env:
+#COMPILED: yes
+#DEPS: no
 
 - name: remove compiled binaries
   run: |
@@ -159,11 +159,12 @@
   with:
 python-version: '3.7'
 
-- name: install
-  run: make install-testing
-
-- name: test
-  run: make test-fastapi
+- run: echo "skip fastapi for now"
+#- name: install
+#  run: make install-testing
+#
+#- name: test
+#  run: make test-fastapi
 
   benchmark:
 name: run benchmarks
diff -Nru pydantic-1.7.3/HISTORY.md pydantic-1.7.4/HISTORY.md
--- pydantic-1.7.3/HISTORY.md   2020-11-30 19:33:24.0 -0400
+++ pydantic-1.7.4/HISTORY.md   2021-05-11 15:04:58.0 -0400
@@ -1,3 +1,9 @@
+## v1.7.4 (2021-05-11)
+
+* **Security fix:** Fix `date` and `datetime` parsing so passing either 
`'infinity'` or `float('inf')` 
+  (or their negative values) does not cause an infinite loop,
+  See security advisory 
[CVE-2021-29510](https://github.com/samuelcolvin/pydantic/security/advisories/GHSA-5jqp-qgf6-3pvh)
+
 ## v1.7.3 (2020-11-30)
 
 Thank you to pydantic's sponsors:
diff -Nru pydantic-1.7.3/pydantic/datetime_parse.py 
pydantic-1.7.4/pydantic/datetime_parse.py
--- pydantic-1.7.3/pydantic/datetime_parse.py   2020-11-30 19:33:24.0 
-0400
+++ pydantic-1.7.4/pydantic/datetime_parse.py   2021-05-11 15:04:58.0 
-0400
@@ -58,6 +58,8 @@
 # if greater than this, the number is in ms, if less than or equal it's in 
seconds
 # (in seconds this is 11th October 2603, in ms it's 20th August 1970)
 MS_WATERSHED = int(2e10)
+# slightl

Bug#987547: debspawn: diff for NMU version 0.4.1-1.1

2021-05-21 Thread Stefano Rivera

Control: tags 987547 + pending

Dear maintainer,

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

Regards.

SR
diff -Nru debspawn-0.4.1/debian/changelog debspawn-0.4.1/debian/changelog
--- debspawn-0.4.1/debian/changelog	2020-12-21 21:16:47.0 -0400
+++ debspawn-0.4.1/debian/changelog	2021-05-21 15:23:54.0 -0400
@@ -1,3 +1,10 @@
+debspawn (0.4.1-1.1) unstable; urgency=medium
+
+  * Depend on dpkg-dev, which was Recommended through build-essential, but not
+required, causing a crash. (Closes: #987547)
+
+ -- Stefano Rivera   Fri, 21 May 2021 15:23:54 -0400
+
 debspawn (0.4.1-1) unstable; urgency=medium
 
   * New upstream version: 0.4.1
diff -Nru debspawn-0.4.1/debian/control debspawn-0.4.1/debian/control
--- debspawn-0.4.1/debian/control	2020-12-21 21:15:47.0 -0400
+++ debspawn-0.4.1/debian/control	2021-05-21 15:23:38.0 -0400
@@ -19,6 +19,7 @@
 Package: debspawn
 Architecture: all
 Depends: debootstrap,
+ dpkg-dev,
  python3-toml,
  systemd-container,
  zstd,

Bug#987646: eclipse-titan: diff for NMU version 7.2.0-1.1

2021-05-21 Thread Stefano Rivera

Control: tags 987646 + patch

Dear maintainer,

I've prepared an NMU for eclipse-titan (versioned as 7.2.0-1.1). The diff
is attached to this message.

Regards.

SR
diff -Nru eclipse-titan-7.2.0/debian/changelog eclipse-titan-7.2.0/debian/changelog
--- eclipse-titan-7.2.0/debian/changelog	2021-02-16 05:25:17.0 -0400
+++ eclipse-titan-7.2.0/debian/changelog	2021-05-21 14:58:09.0 -0400
@@ -1,3 +1,11 @@
+eclipse-titan (7.2.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Re-instate the --no-parallel option, fixing FTBFS on multi-core machines.
+(Closes: #987646)
+
+ -- Stefano Rivera   Fri, 21 May 2021 14:58:09 -0400
+
 eclipse-titan (7.2.0-1) unstable; urgency=medium
 
   * New release.
diff -Nru eclipse-titan-7.2.0/debian/rules eclipse-titan-7.2.0/debian/rules
--- eclipse-titan-7.2.0/debian/rules	2021-02-16 05:20:17.0 -0400
+++ eclipse-titan-7.2.0/debian/rules	2021-05-21 14:48:25.0 -0400
@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-	dh $@ --verbose
+	dh $@ --verbose --no-parallel
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l$(CURDIR)/Install/lib

Bug#988939: unblock: whipper/0.9.0-7

2021-05-21 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Krzysztof Krzyżaniak (eloy) 

Please unblock package whipper

Adds a couple of missing dependencies, and fixes up a stale description
talking about Python 2.7.

[ Reason ]
Fixes RC bugs for missing dependencies.

[ Impact ]
Without this, I'd expect auto-removal :)

[ Tests ]
Checked that the package installs and runs --help, which it didn't
before.

[ Risks ]
Changes are trivial.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

[ Other info ]
Changelog is kinda weird, but I was mostly just sponsoring an upload for
a DD, so shrug.

unblock whipper/0.9.0-7
diff -Nru whipper-0.9.0/debian/changelog whipper-0.9.0/debian/changelog
--- whipper-0.9.0/debian/changelog  2020-05-29 02:17:36.0 -0400
+++ whipper-0.9.0/debian/changelog  2021-04-27 08:22:21.0 -0400
@@ -1,3 +1,26 @@
+whipper (0.9.0-7) unstable; urgency=medium
+
+  [ Krzysztof Krzyżaniak (eloy) ]
+  * control: Update dependencies, added flac package (Closes: #978166)
+
+  [ Stefano Rivera ]
+  * Depend on python3-distutils, it's used at runtime (Closes: #971628)
+
+ -- Krzysztof Krzyżaniak (eloy)   Tue, 27 Apr 2021 14:22:21 
+0200
+
+whipper (0.9.0-6) unstable; urgency=medium
+
+  * Non maintainer upload by the Reproducible Builds team.
+  * No source change upload to rebuild on buildd with .buildinfo files.
+
+ -- Krzysztof Krzyżaniak (eloy)   Fri, 01 Jan 2021 22:04:03 
+0100
+
+whipper (0.9.0-5) unstable; urgency=medium
+
+  * control: Update description (closes: #968880)
+
+ -- Krzysztof Krzyżaniak (eloy)   Sun, 23 Aug 2020 13:39:11 
+0200
+
 whipper (0.9.0-4) unstable; urgency=medium
 
   * control: Add cdrdao to depends. (Closes: #961758)
diff -Nru whipper-0.9.0/debian/control whipper-0.9.0/debian/control
--- whipper-0.9.0/debian/control2020-05-29 02:05:48.0 -0400
+++ whipper-0.9.0/debian/control2021-04-27 08:22:21.0 -0400
@@ -22,6 +22,7 @@
 Depends: ${python3:Depends},
   ${shlibs:Depends},
   ${misc:Depends},
+  python3-distutils,
   python3-musicbrainzngs,
   python3-cdio,
   python3-requests,
@@ -31,8 +32,9 @@
   sox,
   cd-paranoia,
   cdrdao,
-Description: CD-DA ripper based
- Whipper is a Python 2.7 CD-DA ripper based on the morituri project
+  flac
+Description: CD ripping utility focusing on accuracy over speed
+ Whipper is a Python CD-DA ripper based on the morituri project
  (CDDA ripper for *nix systems aiming for accuracy over speed). It enhances
  morituri which development seems to have halted merging old ignored pull
  requests, improving it with bugfixes and new features.

Bug#978166: Updated package

2021-05-21 Thread Stefano Rivera

Hi eloy (2021.05.08_05:58:59_-0400)
> There's updated package released in salsa.debian.org
> https://salsa.debian.org/debian/whipper/-/tree/debian/0.9.0-7 but I
> have problems with uploading it into ftp debian.org. Until I resolve
> problems with uploading someone can take build from there and upload it.

I added a fix for #971628 and sponsored the upload.

The changelog is kind of weird, it has many uploads in it that never hit
the Debian archive... Without know the back-story, I didn't fold them
into a -5, but kept it as -7.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Bug#988926: unblock: pyyaml/5.3.1-4

2021-05-21 Thread Stefano Rivera

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Scott Kitterman , Michael Hudson-Doyle 


Please unblock package pyyaml

pyyaml (5.3.1-4) unstable; urgency=medium

  * Team upload.

  [ Debian Janitor ]
  * Apply multi-arch hints.
+ python3-yaml-dbg: Add Multi-Arch: same.

  [ Stefano Rivera ]
  * Resolve CVE-2020-14343, more trivial RCEs in .load() and FullLoader.
(Closes: #966233)

 -- Stefano Rivera   Fri, 21 May 2021 11:11:00 -0400

[ Reason ]
Fixes a security issue (#966233, CVE-2020-14343).

Not expecting it to be 100% secure, that requires more significant API
changes, but at least it's a bit better.
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

[ Impact ]
Known RCE risk in a parsing library.

[ Tests ]
Manually tested that the example exploits are mitigated.

[ Risks ]
Haven't checked reverse-dependencies (there are a lot of them) for
breakage.

Ubuntu has carried this patch for a month, with no known issues.

I saw one issue mentioned on github, but that doesn't trigger an FTBFS
for us (no build-dep on pyyaml): 
https://github.com/networkx/networkx/issues/4569

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock pyyaml/5.3.1-4
diff -Nru pyyaml-5.3.1/debian/changelog pyyaml-5.3.1/debian/changelog
--- pyyaml-5.3.1/debian/changelog   2020-10-22 19:33:33.0 -0400
+++ pyyaml-5.3.1/debian/changelog   2021-05-21 11:11:00.0 -0400
@@ -1,3 +1,17 @@
+pyyaml (5.3.1-4) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Debian Janitor ]
+  * Apply multi-arch hints.
++ python3-yaml-dbg: Add Multi-Arch: same.
+
+  [ Stefano Rivera ]
+  * Resolve CVE-2020-14343, more trivial RCEs in .load() and FullLoader.
+(Closes: #966233)
+
+ -- Stefano Rivera   Fri, 21 May 2021 11:11:00 -0400
+
 pyyaml (5.3.1-3) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru pyyaml-5.3.1/debian/control pyyaml-5.3.1/debian/control
--- pyyaml-5.3.1/debian/control 2020-10-22 19:33:33.0 -0400
+++ pyyaml-5.3.1/debian/control 2021-05-21 11:11:00.0 -0400
@@ -25,6 +25,7 @@
 Section: debug
 Architecture: any
 Depends: python3-yaml (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, 
${misc:Depends}
+Multi-Arch: same
 Description: YAML parser and emitter for Python3 (debug build)
  Python3-yaml is a complete YAML 1.1 parser and emitter for Python3.  It can
  parse all examples from the specification. The parsing algorithm is simple
diff -Nru pyyaml-5.3.1/debian/patches/cve-2020-14343.patch 
pyyaml-5.3.1/debian/patches/cve-2020-14343.patch
--- pyyaml-5.3.1/debian/patches/cve-2020-14343.patch1969-12-31 
20:00:00.0 -0400
+++ pyyaml-5.3.1/debian/patches/cve-2020-14343.patch2021-05-21 
11:11:00.0 -0400
@@ -0,0 +1,127 @@
+From: =?utf-8?q?Ingy_d=C3=B6t_Net?= 
+Date: Sat, 9 Jan 2021 10:53:23 -0500
+Subject: Fix for CVE-2020-14343
+
+Per suggestion https://github.com/yaml/pyyaml/issues/420#issuecomment-663888344
+move a few constructors from full_load to unsafe_load.
+
+Bug-Debian: https://bugs.debian.org/966233
+Bug-Upstream: https://github.com/yaml/pyyaml/issues/420
+Origin: upstream, 
https://github.com/yaml/pyyaml/commit/a001f2782501ad2d24986959f0239a354675f9dc
+---
+ lib/yaml/constructor.py  | 24 
+ lib3/yaml/constructor.py | 24 
+ tests/lib/test_recursive.py  |  2 +-
+ tests/lib3/test_recursive.py |  2 +-
+ 4 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/lib/yaml/constructor.py b/lib/yaml/constructor.py
+index 794681c..c42ee34 100644
+--- a/lib/yaml/constructor.py
 b/lib/yaml/constructor.py
+@@ -722,18 +722,6 @@ FullConstructor.add_multi_constructor(
+ u'tag:yaml.org,2002:python/name:',
+ FullConstructor.construct_python_name)
+ 
+-FullConstructor.add_multi_constructor(
+-u'tag:yaml.org,2002:python/module:',
+-FullConstructor.construct_python_module)
+-
+-FullConstructor.add_multi_constructor(
+-u'tag:yaml.org,2002:python/object:',
+-FullConstructor.construct_python_object)
+-
+-FullConstructor.add_multi_constructor(
+-u'tag:yaml.org,2002:python/object/new:',
+-FullConstructor.construct_python_object_new)
+-
+ class UnsafeConstructor(FullConstructor):
+ 
+ def find_python_module(self, name, mark):
+@@ -750,6 +738,18 @@ class UnsafeConstructor(FullConstructor):
+ return super(UnsafeConstructor, self).set_python_instance_state(
+ instance, state, unsafe=True)
+ 
++UnsafeConstructor.add_multi_constructor(
++u'tag:yaml.org,2002:python/module:',
++UnsafeConstructor.construct_python_module)
++
++UnsafeConstructor.add_multi_constructor(
++u'tag:yaml.org,2002:python/object:',
++UnsafeConstructor.construct_python_object)
++
++UnsafeConstructor.add_multi_constructor(
++u'tag:yaml.org,2002:python/object

< 1 2 3 4 5 6 7 8 9 10 >

301 - 400 of 1170 matches

Mail list logo