diff --git a/conda/meta.yaml b/conda/meta.yaml index cdd9ece09a656a8bf0c880c08ad184f049c147db..4d04ba95d576f36943b1016e915a87cb017122f3 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -42,17 +42,18 @@ requirements: - bob.ip.facedetect - bob.pipelines - matplotlib {{ matplotlib }} + - scikit-image {{ scikit_image }} - six {{ six }} + - tensorflow {{ tensorflow }} # [linux] run: - python - setuptools - - matplotlib - - six - - scikit-image - optional: + - {{ pin_compatible('matplotlib') }} + - {{ pin_compatible('six') }} + - {{ pin_compatible('scikit-image') }} + run_constrained: - bob.learn.tensorflow - {{ pin_compatible('tensorflow') }} # [linux] - - mxnet test: imports: @@ -83,10 +84,8 @@ test: - bob.db.scface - bob.db.xm2vts - bob.db.fargo - - bob.bio.gmm - - gridtk - - bob.learn.tensorflow - - tensorflow + - bob.learn.tensorflow # [linux] + - tensorflow # [linux] about: home: https://www.idiap.ch/software/bob/ diff --git a/test-requirements.txt b/test-requirements.txt index 8471d417f123900c9dc75ada458b1203c7851db4..83f3b55e6b716175686890458c1f93fc05222d09 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,3 @@ -gridtk bob.db.arface bob.db.atnt bob.db.banca @@ -15,4 +14,3 @@ bob.db.replaymobile bob.db.scface bob.db.xm2vts bob.db.fargo -bob.bio.gmm