Repository navigation
Commit 2d81019
committed
fix(deps): require dyno 0.1.15 and install it from conda-forge
The floor of 0.1.13 was wrong in two ways, both of which left CI red:
- `tests/test_model_v2.py` and `tests/test_tau_garray.py` import
`dyno.dynspec.recipe.extract_complementarity`, which only exists from
0.1.15 on. On 0.1.13/0.1.14 collection aborts and every job fails.
- the 0.1.13/0.1.14 wheels carry both `dyno/examples/RBC.dyno` and
`dyno/examples/rbc.dyno`; the case-insensitive collision makes uv
refuse to extract them, so `pixi install` failed on macOS and Windows
(Linux tolerated it, which is why only those platforms broke).
Raise the floor to `dynopy>=0.1.15,<0.2` and take the package from
conda-forge as `dyno`, which is now released there. conda-forge moves
ahead of the econforge channel: with pixi's default strict channel
priority the first channel carrying a package wins, and econforge still
only had 0.1.14, so it was shadowing the new release. min-deps pins the
same version, and ci/check_deps.py maps the PyPI name `dynopy` to the
conda name `dyno` (`CONDA_NAMES`) so the two manifests stay in sync.
The `../dyno.py` editable checkout and its PYTHONPATH guard were already
removed; nothing here depends on a sibling checkout any more.
Verified locally with the lock: `pixi install -e dev --locked` succeeds,
`extract_complementarity` imports, `pytest` gives 78 passed, and
`zensical build --clean --strict` is clean.
Note: the editable `dolo` declares `dynopy` as a PyPI dependency, so the
lock also installs the PyPI `dynopy` alongside the conda `dyno`. Both
resolve to the same 0.1.15 release, so the installed files are identical.1 parent acf7955 commit 2d81019
5 files changed
Lines changed: 974 additions & 825 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
19 | 22 | | |
20 | 23 | | |
21 | 24 | | |
| |||
139 | 142 | | |
140 | 143 | | |
141 | 144 | | |
142 | | - | |
143 | | - | |
| 145 | + | |
| 146 | + | |
144 | 147 | | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
157 | 164 | | |
158 | 165 | | |
159 | 166 | | |
160 | | - | |
161 | | - | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
162 | 170 | | |
163 | 171 | | |
164 | 172 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
31 | 33 | | |
32 | 34 | | |
33 | 35 | | |
| |||
0 commit comments