From 983955d61a09f177dc3c2ffedc9a0c91c1e6d4a2 Mon Sep 17 00:00:00 2001
From: Yannick DAYER <yannick.dayer@idiap.ch>
Date: Wed, 14 Jun 2023 11:20:16 +0200
Subject: [PATCH] meta(deps): add bob as dependency in new structure
---
conda/meta.yaml | 22 ++++++++++++----------
pyproject.toml | 14 +++++++-------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 45a60d0..540153d 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -21,30 +21,32 @@ requirements:
- python {{ python }}
- setuptools {{ setuptools }}
- pip {{ pip }}
+ - bob
+ - bob.io.base
+ - bob.bio.base
+ - clapper {{ clapper }}
+ - docopt {{ docopt }}
+ - matplotlib {{ matplotlib }}
- numpy {{ numpy }}
- - scipy {{ scipy }}
- pillow {{ pillow }}
- schema {{ schema }}
- - docopt {{ docopt }}
- scikit-image {{ scikit_image }}
- - matplotlib {{ matplotlib }}
- - clapper
- - bob.io.base
- - bob.bio.base
+ - scipy {{ scipy }}
run:
- python
- setuptools
- - clapper
+ - bob
- bob.io.base
- bob.bio.base
+ - {{ pin_compatible('clapper') }}
+ - {{ pin_compatible('docopt') }}
+ - {{ pin_compatible('matplotlib') }}
- {{ pin_compatible('numpy') }}
- - {{ pin_compatible('scipy') }}
- {{ pin_compatible('pillow') }}
- {{ pin_compatible('schema') }}
- - {{ pin_compatible('docopt') }}
- {{ pin_compatible('scikit-image') }}
- - {{ pin_compatible('matplotlib') }}
+ - {{ pin_compatible('scipy') }}
test:
imports:
diff --git a/pyproject.toml b/pyproject.toml
index 8b0e965..10b1cfb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,17 +27,17 @@
"Topic :: Software Development :: Libraries :: Python Modules",
]
dependencies = [
- "setuptools",
+ "bob",
+ "bob.io.base",
+ "bob.bio.base",
+ "clapper",
+ "docopt",
+ "matplotlib",
"numpy",
- "scipy",
"pillow",
"schema",
- "docopt",
"scikit-image",
- "matplotlib",
- "clapper",
- "bob.io.base",
- "bob.bio.base",
+ "scipy",
]
[project.urls]
--
GitLab