From 01e6d037cd8761174d80df4d18d548b3eda44dd0 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Mon, 4 Oct 2021 16:32:26 +0200
Subject: [PATCH] bob.buildout is a pip only package now
---
bob/devtools/build.py | 8 ++------
bob/devtools/data/conda_build_config.yaml | 6 +-----
doc/install.rst | 1 +
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/bob/devtools/build.py b/bob/devtools/build.py
index 8e0fe08f..7d5dcc85 100644
--- a/bob/devtools/build.py
+++ b/bob/devtools/build.py
@@ -331,17 +331,13 @@ def parse_dependencies(recipe_dir, config):
requirements += recipe.get("requirements", {}).get("run", [])
requirements += recipe.get("test", {}).get("requires", [])
- # also add anaconda compilers to make sure source installed packages are
+ # also add conda-forge compilers to make sure source installed packages are
# compiled properly
- if platform.system() == "Darwin":
- requirements += ["clangxx_osx-64"]
- else:
- requirements += ["gxx_linux-64"]
+ requirements += ["compilers"]
# further requirements
requirements += [
"pip", # required for installing further packages
- "bob.buildout", # required for basic bootstrap of most recipes
"ipython", # for ipdb
]
diff --git a/bob/devtools/data/conda_build_config.yaml b/bob/devtools/data/conda_build_config.yaml
index 2f3180dd..286a2391 100644
--- a/bob/devtools/data/conda_build_config.yaml
+++ b/bob/devtools/data/conda_build_config.yaml
@@ -293,7 +293,7 @@ pin_run_as_build:
# update this version to the current date when you modify the pins below
bob_devel_version:
- - 2021.10.03
+ - 2021.10.04
# AUTOMATIC PARSING START
# DO NOT MODIFY THIS COMMENT
@@ -451,9 +451,5 @@ tqdm:
- 4.62.3
xarray:
- 0.19.0
-zc_buildout:
- - 2.13.4
-zc_recipe_egg:
- - 2.0.7
# AUTOMATIC PARSING END
diff --git a/doc/install.rst b/doc/install.rst
index 23bbec3d..feac0ebf 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -86,6 +86,7 @@ pip-installable packages, create a section named ``create`` in the file
[create]
pip_extras = ipdb
+ bob.buildout
mr.developer
Then, by default, ``bdt create`` will automatically pip install ``ipdb`` and
--
GitLab