From 81156da5a84a5fc0eee3572c301c8b333fb9c87f Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 19 Nov 2020 17:56:03 +0100
Subject: [PATCH] clean-up dependencies
---
conda/meta.yaml | 17 ++++++++---------
test-requirements.txt | 2 --
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/conda/meta.yaml b/conda/meta.yaml
index cdd9ece0..4d04ba95 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 8471d417..83f3b55e 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
--
GitLab