From 0d0ee2c210a39ac96f2d65f66ae564ab082b3b9c Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Fri, 13 Nov 2020 12:50:45 +0100
Subject: [PATCH] clean-up dependencies
---
conda/meta.yaml | 10 ++++------
develop.cfg | 22 +++++++---------------
requirements.txt | 8 +++-----
test-requirements.txt | 3 +++
4 files changed, 17 insertions(+), 26 deletions(-)
create mode 100644 test-requirements.txt
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 3dff2245..9ee0693b 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -22,13 +22,11 @@ requirements:
- python {{ python }}
- setuptools {{ setuptools }}
- bob.extension
- - bob.io.base
- - bob.io.image
- - bob.measure
- numpy {{ numpy }}
- scipy {{ scipy }}
- click {{ click }}
- click-plugins {{ click_plugins }}
+ - scikit-learn {{ scikit_learn }}
- tensorflow {{ tensorflow }} # [linux]
run:
- python
@@ -37,8 +35,9 @@ requirements:
- {{ pin_compatible('scipy') }}
- {{ pin_compatible('click') }}
- {{ pin_compatible('click-plugins') }}
- - {{ pin_compatible('scikit-learn') }}
- {{ pin_compatible('tensorflow') }} # [linux]
+ run_constrained:
+ - {{ pin_compatible('scikit-learn') }}
test:
imports:
@@ -57,10 +56,9 @@ test:
- coverage
- sphinx
- sphinx_rtd_theme
- - bob.io.image
- bob.db.atnt
- matplotlib
- - gridtk
+ - scikit-learn
about:
home: https://www.idiap.ch/software/bob/
diff --git a/develop.cfg b/develop.cfg
index 1e13ea43..ceea8266 100644
--- a/develop.cfg
+++ b/develop.cfg
@@ -4,19 +4,15 @@
[buildout]
parts = scripts
-eggs = bob.learn.tensorflow
- bob.db.casia_webface
- bob.db.mobio
- gridtk
+eggs = bob.extension
+ bob.db.atnt
+ bob.learn.tensorflow
extensions = bob.buildout
mr.developer
auto-checkout = *
-develop = src/bob.db.mnist
- src/gridtk
- src/bob.db.casia_webface
- src/bob.db.mobio
- src/bob.db.lfw
+develop = src/bob.extension
+ src/bob.db.atnt
.
; options for bob.buildout
@@ -26,12 +22,8 @@ newest = false
[sources]
-bob.db.mnist = git git@gitlab.idiap.ch:bob/bob.db.mnist.git
-bob.db.base = git git@gitlab.idiap.ch:bob/bob.db.base.git
-bob.db.mobio = git git@gitlab.idiap.ch:bob/bob.db.mobio.git
-bob.db.lfw = git git@gitlab.idiap.ch:bob/bob.db.lfw.git
-bob.db.casia_webface = git git@gitlab.idiap.ch:bob/bob.db.casia_webface.git
-gridtk = git git@gitlab.idiap.ch:bob/gridtk
+bob.extension = git git@gitlab.idiap.ch:bob/bob.extension.git
+bob.db.atnt = git git@gitlab.idiap.ch:bob/bob.db.atnt.git
[scripts]
diff --git a/requirements.txt b/requirements.txt
index f20318aa..d0a7d0ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,7 @@
setuptools
bob.extension
-bob.io.base
-bob.io.image
-bob.measure
numpy
-click >= 7
scipy
-scikit-learn
\ No newline at end of file
+click >= 7
+click-plugins
+tensorflow
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..a2139571
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,3 @@
+bob.db.atnt
+matplotlib
+scikit-learn
--
GitLab