diff --git a/conda/meta.yaml b/conda/meta.yaml index ad60d11529f1faa1213e8bf1156704daab239b35..8aca287339f5ef9e13978b8c9bd5dcdce372f38a 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -43,7 +43,6 @@ requirements: - bob.pipelines - matplotlib {{ matplotlib }} - six {{ six }} - - mxnet run: - python - setuptools @@ -53,6 +52,7 @@ requirements: optional: - bob.learn.tensorflow - tensorflow + - mxnet test: imports: diff --git a/requirements.txt b/requirements.txt index 0b573c7e11e5d64d5b1acdafc7afe8df397c0cbc..85daa8e08d1c6660e3d11fe9d6f798e3a18814ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,5 +20,4 @@ bob.ip.facedetect bob.pipelines matplotlib # for plotting six -scikit-image -mxnet \ No newline at end of file +scikit-image \ No newline at end of file