Commit 14392197 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Revert "Revert "Merge branch 'conda' into 'master'""

This reverts commit 9e104b58.
parent ca607c81
......@@ -23,9 +23,11 @@ requirements:
- setuptools {{ setuptools }}
- six {{ six }}
- bob.db.base
- scipy
run:
- python
- setuptools
- numpy
- six
test:
......@@ -41,6 +43,7 @@ test:
- bob-devel {{ bob_devel }}.*
- nose
- coverage
- scipy
- sphinx
- sphinx_rtd_theme
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment