Merge branch 'update2' into 'master'

Updates

See merge request !16

bob/pipelines/mixins.py

@@ -91,7 +91,7 @@ def estimator_dask_it(
     )
 
     # Tagging each element in a pipeline
-    if isinstance(o, Pipeline) and mix_for_each_step_in_pipelines:
+    if isinstance(o, Pipeline):
 
         # Tagging each element for fitting and transforming
         if fit_tag is not None:

conda/meta.yaml

@@ -31,7 +31,7 @@ requirements:
     - dask-jobqueue
     - numpy {{ numpy }}
     - h5py
-    - scikit-learn
+    - scikit-learn >-= 0.22
   run:
     - python
     - setuptools

requirements.txt

@@ -2,6 +2,6 @@ setuptools
 numpy
 bob.extension
 bob.io.base
-scikit-learn
+scikit-learn >= 0.22
 dask
 dask-jobqueue