From 9724e8f3af6c8fddce66ed9558e77ed22891b1d6 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Fri, 2 Jul 2021 16:24:56 +0200
Subject: [PATCH] Add conda-forge as a low priority channel in the builds
---
bob/devtools/bootstrap.py | 17 +++++++++++++----
bob/devtools/build.py | 9 +++++++--
bob/devtools/scripts/build.py | 3 ++-
bob/devtools/scripts/create.py | 3 ++-
bob/devtools/scripts/graph.py | 3 ++-
bob/devtools/scripts/rebuild.py | 3 ++-
bob/devtools/scripts/test.py | 9 +++++++--
7 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index 837bb485..29467407 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -282,7 +282,7 @@ def install_miniconda(prefix, name):
shutil.rmtree(cached)
-def get_channels(public, stable, server, intranet, group):
+def get_channels(public, stable, server, intranet, group, add_dependent_channels=False):
"""Returns the relevant conda channels to consider if building project.
The subset of channels to be returned depends on the visibility and
@@ -310,6 +310,8 @@ def get_channels(public, stable, server, intranet, group):
compiling is part of. Values should match URL namespaces currently
available on our internal webserver. Currently, only "bob" or "beat"
will work.
+ add_dependent_channels: If True, will add the defaults and conda-forge
+ channels to the list
Returns: a list of channels that need to be considered.
@@ -347,6 +349,9 @@ def get_channels(public, stable, server, intranet, group):
)
]
+ if add_dependent_channels:
+ channels += ["defaults", "conda-forge"]
+
return channels, upload_channel
@@ -516,9 +521,13 @@ if __name__ == "__main__":
conda_bld_path = os.path.join(args.conda_root, "conda-bld")
run_cmdline([conda_bin, "index", conda_bld_path])
channels, _ = get_channels(
- public=True, stable=True, server=_SERVER, intranet=True, group="bob"
+ public=True,
+ stable=True,
+ server=_SERVER,
+ intranet=True,
+ group="bob",
+ add_dependent_channels=True,
)
- channels += ["defaults"]
channels = (
["--override-channels"]
+ ["--channel=" + conda_bld_path]
@@ -541,9 +550,9 @@ if __name__ == "__main__":
server=_SERVER,
intranet=True,
group="bob",
+ add_dependent_channels=True,
)
- channels += ["defaults"]
channels = ["--override-channels"] + ["--channel=%s" % k for k in channels]
conda_cmd = "install" if args.envname in ("base", "root") else "create"
cmd = (
diff --git a/bob/devtools/build.py b/bob/devtools/build.py
index 5b8f9958..0e7178c2 100644
--- a/bob/devtools/build.py
+++ b/bob/devtools/build.py
@@ -602,11 +602,16 @@ def base_build(
# if you get to this point, tries to build the package
channels, upload_channel = bootstrap.get_channels(
- public=True, stable=True, server=server, intranet=intranet, group=group
+ public=True,
+ stable=True,
+ server=server,
+ intranet=intranet,
+ group=group,
+ add_dependent_channels=True,
)
if "channels" not in condarc_options:
- condarc_options["channels"] = channels + ["defaults"]
+ condarc_options["channels"] = channels
logger.info(
"Using the following channels during (potential) build:\n - %s",
diff --git a/bob/devtools/scripts/build.py b/bob/devtools/scripts/build.py
index e7e55754..99b859c1 100644
--- a/bob/devtools/scripts/build.py
+++ b/bob/devtools/scripts/build.py
@@ -198,10 +198,11 @@ def build(
server=server,
intranet=ci,
group=group,
+ add_dependent_channels=True,
)
if "channels" not in condarc_options:
- condarc_options["channels"] = channels + ["defaults"]
+ condarc_options["channels"] = channels
logger.info(
"Using the following channels during (potential) build:\n - %s",
diff --git a/bob/devtools/scripts/create.py b/bob/devtools/scripts/create.py
index 30e87a88..426c1bf0 100644
--- a/bob/devtools/scripts/create.py
+++ b/bob/devtools/scripts/create.py
@@ -256,8 +256,9 @@ def create(
server=server,
intranet=private,
group=group,
+ add_dependent_channels=True,
)
- condarc_options["channels"] = channels + ["defaults"]
+ condarc_options["channels"] = channels
logger.info(
"Using the following channels during environment creation:" "\n - %s",
diff --git a/bob/devtools/scripts/graph.py b/bob/devtools/scripts/graph.py
index 9c18d1a8..685ccec7 100644
--- a/bob/devtools/scripts/graph.py
+++ b/bob/devtools/scripts/graph.py
@@ -178,6 +178,7 @@ def graph(
server=server,
intranet=ci,
group=package_group,
+ add_dependent_channels=True,
)
if condarc is not None:
@@ -189,7 +190,7 @@ def graph(
condarc_options = yaml.load(BASE_CONDARC, Loader=yaml.FullLoader)
if "channels" not in condarc_options:
- condarc_options["channels"] = channels + ["defaults"]
+ condarc_options["channels"] = channels
logger.info(
"Using the following channels during graph operation:\n - %s",
diff --git a/bob/devtools/scripts/rebuild.py b/bob/devtools/scripts/rebuild.py
index e653af0b..501b3372 100644
--- a/bob/devtools/scripts/rebuild.py
+++ b/bob/devtools/scripts/rebuild.py
@@ -183,6 +183,7 @@ def rebuild(
server=server,
intranet=ci,
group=group,
+ add_dependent_channels=True,
)
if condarc is not None:
@@ -194,7 +195,7 @@ def rebuild(
condarc_options = yaml.load(BASE_CONDARC, Loader=yaml.FullLoader)
if "channels" not in condarc_options:
- condarc_options["channels"] = channels + ["defaults"]
+ condarc_options["channels"] = channels
logger.info(
"Using the following channels during (potential) build:\n - %s",
diff --git a/bob/devtools/scripts/test.py b/bob/devtools/scripts/test.py
index 58e3b3a3..d1f9c038 100644
--- a/bob/devtools/scripts/test.py
+++ b/bob/devtools/scripts/test.py
@@ -168,9 +168,14 @@ def test(
from ..bootstrap import get_channels
channels, _ = get_channels(
- public=(not private), stable=stable, server=server, intranet=ci, group=group
+ public=(not private),
+ stable=stable,
+ server=server,
+ intranet=ci,
+ group=group,
+ add_dependent_channels=True,
)
- condarc_options["channels"] = channels + ["defaults"]
+ condarc_options["channels"] = channels
logger.info(
"Using the following channels during (potential) build:\n - %s",
--
GitLab