Merge ~uralt/ubuntu/+source/zict:lp2134546 into ubuntu/+source/zict:debian/sid

[Ural Tunaboyu]

Builds in PPA: https://launchpad.net/~uralt/+archive/ubuntu/resolute-merges/+build/31586541/+files/buildlog_ubuntu-resolute-amd64.zict_3.0.0-4ubuntu1~ppa1_BUILDING.txt.gz

autopkgtests (all pass):
 - amd64: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-uralt-resolute-merges/resolute/amd64/z/zict/20251211_201926_3f6b0@/log.gz
 - arm64: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-uralt-resolute-merges/resolute/arm64/z/zict/20251211_201828_0f9de@/log.gz
 - armhf: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-uralt-resolute-merges/resolute/armhf/z/zict/20251211_202649_eb94d@/log.gz
 - s390x: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-uralt-resolute-merges/resolute/s390x/z/zict/20251211_202559_07a1c@/log.gz
 - ppc64el: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-uralt-resolute-merges/resolute/ppc64el/z/zict/20251211_201820_bc1ee@/log.gz

Unmerged commits

d1dcacb... by Ural Tunaboyu on 2025-12-11

changelog

f772de8... by Ural Tunaboyu on 2025-12-11

update-maintainer

588f3ec... by Ural Tunaboyu on 2025-12-11

reconstruct-changelog

e077fc3... by Ural Tunaboyu on 2025-12-11

merge-changelogs

8520933... by Ural Tunaboyu on 2025-12-11

d/p/prevent_test_timeout_on_single_cpu: add patch

Prevent autopkgtest from hanging when running on a single CPU.

diff --git a/debian/changelog b/debian/changelog
index 59fabdd..d8ba5b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zict (3.0.0-4ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2134546). Remaining changes:
+    - d/p/prevent_test_timeout_on_single_cpu: add patch to prevent test
+      timeout on a single CPU (LP #2033759).
+
+ -- Ural Tunaboyu <[e-mail]>  Thu, 11 Dec 2025 09:32:26 -0800
+
 zict (3.0.0-4) unstable; urgency=medium
 
   * Team upload.
@@ -15,6 +23,12 @@ zict (3.0.0-3) unstable; urgency=medium
 
  -- Alexandre Detiste <[e-mail]>  Sat, 23 Aug 2025 19:00:16 +0200
 
+zict (3.0.0-2ubuntu1) mantic; urgency=medium
+
+  * Prevent test timeout on a single CPU (LP: #2033759).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 02 Oct 2023 11:54:38 +1300
+
 zict (3.0.0-2) unstable; urgency=medium
 
   * Add update-pytest-markers.patch to list repeat marker
diff --git a/debian/control b/debian/control
index e3d26ef..0e370b9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: zict
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Diane Trout <[e-mail]>,
 Build-Depends:
diff --git a/debian/patches/prevent_test_timeout_on_single_cpu.patch b/debian/patches/prevent_test_timeout_on_single_cpu.patch
new file mode 100644
index 0000000..11b57f8
--- /dev/null
+++ b/debian/patches/prevent_test_timeout_on_single_cpu.patch
@@ -0,0 +1,20 @@
+Description: Prevent test timeout on a single CPU
+ When running on a single CPU (`taskset -c 0 pytest`), multitasking can
+ misbehave and almost completely starve one of the two threads
+Origin: upstream, https://github.com/dask/zict/pull/108/commits/17a36dc68964c0f91c2d0fc0e7b8c6dc686251ca
+Bug: https://github.com/dask/zict/pull/108
+Bug-Ubuntu: https://launchpad.net/bugs/2033759
+Last-Update: 2023-10-02
+--- a/zict/tests/utils_test.py
++++ b/zict/tests/utils_test.py
+@@ -169,7 +169,9 @@
+ 
+     def worker(idx, key, value):
+         barrier.wait()
+-        while any(c < 10 for c in counters):
++        # When running on a single CPU (`taskset -c 0 pytest`), multitasking can
++        # misbehave and almost completely starve one of the two threads
++        while any(c < 10 for c in counters) and all(c < 1000 for c in counters):
+             z[key] = value
+             try:
+                 assert z[key] == value
diff --git a/debian/patches/series b/debian/patches/series
index 8e42b0d..52b1c25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 update-pytest-markers.patch
+prevent_test_timeout_on_single_cpu.patch