From ceecec3b230454fcb7de2d0b07208d43a4f15cd1 Mon Sep 17 00:00:00 2001
From: Yannick DAYER <yannick.dayer@idiap.ch>
Date: Wed, 14 Jun 2023 10:52:30 +0200
Subject: [PATCH] meta(deps): add bob as dependency in new structure
---
.isort.cfg | 4 ----
conda/meta.yaml | 16 +++++++++-------
pyproject.toml | 12 ++++++------
3 files changed, 15 insertions(+), 17 deletions(-)
delete mode 100644 .isort.cfg
diff --git a/.isort.cfg b/.isort.cfg
deleted file mode 100644
index 8d7af1d..0000000
--- a/.isort.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[settings]
-line_length=88
-order_by_type=true
-lines_between_types=1
diff --git a/conda/meta.yaml b/conda/meta.yaml
index bcf7de6..b1cb17c 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -21,32 +21,34 @@ requirements:
- python {{ python }}
- setuptools {{ setuptools }}
- pip {{ pip }}
- - clapper
# bob dependencies
+ - bob
- bob.io.base
# other libraries
- - numpy {{ numpy }}
+ - clapper {{ clapper }}
- dask {{ dask }}
- dask-jobqueue {{ dask_jobqueue }}
- distributed {{ distributed }}
- - scikit-learn {{ scikit_learn }}
- - xarray {{ xarray }}
- h5py {{ h5py }}
+ - numpy {{ numpy }}
- requests {{ requests }}
+ - scikit-learn {{ scikit_learn }}
+ - xarray {{ xarray }}
# optional dependencies
- dask-ml {{ dask_ml }}
run:
- python
- setuptools
- - clapper
+ - bob
- bob.io.base
- - {{ pin_compatible('numpy') }}
+ - {{ pin_compatible('clapper') }}
- {{ pin_compatible('dask') }}
- {{ pin_compatible('dask-jobqueue') }}
- {{ pin_compatible('distributed') }}
+ - {{ pin_compatible('h5py') }}
+ - {{ pin_compatible('numpy') }}
- {{ pin_compatible('scikit-learn') }}
- {{ pin_compatible('xarray') }}
- - {{ pin_compatible('h5py') }}
- requests
run_constrained:
- {{ pin_compatible('dask-ml') }}
diff --git a/pyproject.toml b/pyproject.toml
index 256a9b0..acc5105 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,17 +26,17 @@
"Topic :: Software Development :: Libraries :: Python Modules",
]
dependencies = [
- "setuptools",
- "numpy",
- "clapper",
+ "bob",
"bob.io.base",
- "scikit-learn",
+ "clapper",
"dask",
- "distributed",
"dask-jobqueue",
- "xarray",
+ "distributed",
"h5py",
+ "numpy",
"requests",
+ "scikit-learn",
+ "xarray",
]
[project.urls]
--
GitLab