diff --git a/conda/meta.yaml b/conda/meta.yaml index 159eebb583c95fba23cfeeb5fdd21265e37148ce..ac8d86a95e927c1c61d17ab1449d87a1eb4fb06d 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -31,6 +31,7 @@ requirements: - dask-ml {{ dask_ml }} - h5py {{ h5py }} - h5py >=3 + - scikit-learn {{ scikit_learn }} run: - python - setuptools @@ -38,6 +39,9 @@ requirements: - {{ pin_compatible('dask') }} - {{ pin_compatible('dask-ml') }} - {{ pin_compatible('h5py') }} + # scikit-learn keeps breaking API in minor versions, so we pin to the + # next minor version + - {{ pin_compatible('scikit-learn', max_pin='x.x') }} test: imports: diff --git a/requirements.txt b/requirements.txt index ece1416436592dde4f830ad1e350a694bf142230..89806f2653f0e6e5a971fb107e848c0beffb5c56 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ bob.extension dask dask-ml h5py >= 3 +scikit-learn