Commit 53458ea
committed
Confine the legacy Kwik constraints to the phy[kwik] extra
phy's own code uses no numpy API removed in 2.0, so the main dependency set
moves to numpy>=1.23 with no upper bound and requires-python stays >=3.10.
Regular users get numpy 2.x and Python 3.13.
Everything the legacy Kwik GUI needs is confined to the kwik extra, which
provides one self-contained, fully working setup -- opening .kwik files,
curating them, and the recluster action (shift+ctrl+K, re-running KlustaKwik2):
numpy>=1.23,<1.24 the last numpy the legacy klusta/klustakwik2 stack was
written against; keeps the whole Kwik surface on tested
ground. Caps the Kwik GUI at Python 3.10-3.11 (numpy 1.23
ships no cp312 wheels).
setuptools<81 klusta/__init__.py imports pkg_resources, dropped in 81
six klusta declares no dependencies of its own
The numpy pin is deliberately conservative rather than strictly required:
reclustering runs on newer numpy (verified via klusta.launch.cluster(), the
function the GUI action calls, on numpy 1.26.4), and even numpy 2 works once
ndarray.tostring() -> .tobytes() in klusta/kwik/h5.py and
klustakwik2/precomputations.py is fixed upstream. Pinning to <1.24 trades those
newer versions for a single tested baseline; the cap can be relaxed later.
Verified: phy[kwik] resolves on Python 3.11 (numpy 1.23.5, scipy 1.15.3) and the
full KwikCreator -> KwikModel -> launch.cluster() round-trip passes.1 parent a3c494a commit 53458ea
2 files changed
Lines changed: 89 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
50 | 53 | | |
51 | | - | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
52 | 57 | | |
53 | 58 | | |
54 | | - | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
55 | 65 | | |
56 | 66 | | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
57 | 117 | | |
58 | 118 | | |
59 | 119 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| |||
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
37 | | - | |
| 38 | + | |
38 | 39 | | |
39 | 40 | | |
40 | 41 | | |
| |||
55 | 56 | | |
56 | 57 | | |
57 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
58 | 83 | | |
59 | 84 | | |
60 | 85 | | |
| |||
0 commit comments