Merge branch 'p1' into 'master'

Update meta.yaml

See merge request !30

conda/meta.yaml

@@ -30,10 +30,11 @@ requirements:
     - bob.bio.video
     - bob.learn.linear
     - bob.learn.libsvm
+    - scikit-learn
   run:
     - python
     - setuptools
-    - gridtk
+    - {{ pin_compatible('scikit-learn', min_pin='x.x') }}
 
 test:
   imports:
@@ -48,13 +49,11 @@ test:
     - conda inspect objects -p $PREFIX {{ name }}  # [osx]
   requires:
     - bob-devel {{ bob_devel }}.*
-    - bob.learn.linear
     - nose
-    - gridtk
     - coverage
     - sphinx
     - sphinx_rtd_theme
-    - scikit-learn
+    - gridtk
 
 about:
   home: https://www.idiap.ch/software/bob/

requirements.txt

@@ -7,3 +7,4 @@ bob.bio.base
 bob.bio.video
 bob.learn.libsvm
 bob.learn.linear
+scikit-learn
\ No newline at end of file