Commit 942fb7b
Make pandas an optional dependency (#1831)
* Make pandas an optional dependency
* Fix mypy errors uncovered by merge
- Drop `base.utils.*` references in naive_bayes/{bernoulli,multinomial,complement}.py — mypy --strict does not treat re-exposed submodules as exported. Import `utils` directly instead.
- Add `TYPE_CHECKING` pandas import to river/tree/base.py so `pd.DataFrame` annotation resolves.
- Add type annotations to river/utils/pandas.py helpers and river/utils/test_pandas.py tests.
- Sync uv.lock with new optional-pandas dependency layout.
* Verify river works without pandas
- Add a no-pandas CI job (.github/workflows/code-quality.yml) that
installs the dev environment, uninstalls pandas, and runs the full
pytest suite. A conftest hook auto-skips test modules and doctest
sources whose text mentions `import pandas`, `>>> pd.`, or
`fetch_openml` (the latter routes through pandas inside scikit-learn).
- Lazy-load pandas in river.neural_net.mlp so importing river no longer
pulls pandas in. The MLP estimator still requires pandas at call time;
it now goes through utils.pandas.import_pandas() in learn_one /
learn_many / __call__ / predict_one / predict_many.
- Update river.checks to skip the mini-batch consistency checks when
pandas is not installed (mini-batch methods inherently need pandas).
- river.utils.pandas.import_pandas now raises an ImportError that
points the user at `pip install "river[pandas]"`.
- Consolidate the pandas check in river.compat.river_to_sklearn to use
river.utils.pandas.PANDAS_INSTALLED instead of its own duplicate.
- Drop the obsolete cibuildwheel TODO in pyproject.toml — pandas is now
optional, so the comment's premise is gone.
* Cache and pre-download datasets in the no-pandas CI job
Without this step, dataset-using doctests print 'Downloading...' lines
that the doctest framework reports as unexpected output. Mirror the
existing 'ubuntu' job's cache + 'make download-datasets' steps.
* Simplify the optional-pandas helpers
- Cache `import_pandas()` with `functools.cache` so repeated calls in
hot paths (mlp.py, naive_bayes, compose) collapse to a single dict
lookup after the first call.
- Inline the install-hint string into the ImportError; the named
constant added no reuse.
- Drop the "Mini-batch checks are skipped..." comment in checks; the
`if utils.pandas.PANDAS_INSTALLED:` already says it.
- In compat.river_to_sklearn, import pandas directly inside the
`PANDAS_INSTALLED` branch instead of going through `import_pandas()`.
This is a module-load-time block already gated by the flag, so the
indirection only obscured the intent.
---------
Co-authored-by: Max Halford <maxhalford25@gmail.com>1 parent ddbf95e commit 942fb7b
40 files changed
Lines changed: 345 additions & 103 deletions
File tree
- .github/workflows
- docs
- introduction
- releases
- river
- anomaly
- checks
- cluster
- compat
- compose
- covariance
- feature_extraction
- linear_model
- multiclass
- naive_bayes
- neural_net
- preprocessing
- proba
- stream
- tree
- utils
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
102 | 108 | | |
103 | 109 | | |
104 | 110 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
28 | 42 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
3 | 8 | | |
4 | 9 | | |
5 | 10 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
16 | 20 | | |
17 | 21 | | |
18 | 22 | | |
| |||
30 | 34 | | |
31 | 35 | | |
32 | 36 | | |
| 37 | + | |
33 | 38 | | |
34 | 39 | | |
35 | 40 | | |
| |||
82 | 87 | | |
83 | 88 | | |
84 | 89 | | |
85 | | - | |
86 | 90 | | |
87 | 91 | | |
88 | 92 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
| 4 | + | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
11 | 13 | | |
12 | 14 | | |
13 | 15 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
| 3 | + | |
6 | 4 | | |
7 | 5 | | |
8 | 6 | | |
| |||
105 | 103 | | |
106 | 104 | | |
107 | 105 | | |
| 106 | + | |
108 | 107 | | |
109 | 108 | | |
110 | 109 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
146 | 146 | | |
147 | 147 | | |
148 | 148 | | |
149 | | - | |
| 149 | + | |
150 | 150 | | |
151 | 151 | | |
152 | 152 | | |
| |||
188 | 188 | | |
189 | 189 | | |
190 | 190 | | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
197 | 198 | | |
198 | 199 | | |
199 | 200 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
| |||
370 | 369 | | |
371 | 370 | | |
372 | 371 | | |
373 | | - | |
| 372 | + | |
| 373 | + | |
374 | 374 | | |
375 | 375 | | |
376 | 376 | | |
377 | 377 | | |
378 | 378 | | |
379 | | - | |
380 | | - | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
381 | 383 | | |
382 | | - | |
| 384 | + | |
383 | 385 | | |
384 | 386 | | |
385 | 387 | | |
386 | 388 | | |
387 | 389 | | |
388 | 390 | | |
389 | 391 | | |
390 | | - | |
391 | | - | |
392 | | - | |
| 392 | + | |
| 393 | + | |
393 | 394 | | |
394 | 395 | | |
395 | 396 | | |
| |||
406 | 407 | | |
407 | 408 | | |
408 | 409 | | |
409 | | - | |
410 | | - | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
411 | 413 | | |
412 | 414 | | |
413 | 415 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | 7 | | |
15 | 8 | | |
16 | 9 | | |
17 | 10 | | |
18 | 11 | | |
| 12 | + | |
19 | 13 | | |
20 | 14 | | |
21 | 15 | | |
| |||
30 | 24 | | |
31 | 25 | | |
32 | 26 | | |
| 27 | + | |
| 28 | + | |
33 | 29 | | |
34 | 30 | | |
35 | 31 | | |
| |||
0 commit comments