Merge branch 'fix-conda' into 'master'

[conda] Removed bob.measure from the test requirements See merge request !12

Merge branch 'fix-conda' into 'master'
fe05402d · Tiago de Freitas Pereira · 9f8d39fa · 07da4b6e · fe05402d · fe05402d
Commit fe05402d authored 7 years ago by Tiago de Freitas Pereira
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -47,7 +47,6 @@ test:
    - conda inspect objects -p $PREFIX {{ name }}  # [osx]
  requires:
    - bob-devel {{ bob_devel }}.*
-    - bob.measure
    - nose
    - coverage
    - sphinx

--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,5 @@ bob.blitz
 bob.io.base
 bob.io.image
 bob.db.base
+bob.measure
 docopt