From a0aebba482277323b17e00c4d58478a457aee6e6 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Tue, 9 Jul 2019 15:05:27 +0200
Subject: [PATCH] Removed use-local option
---
bob/devtools/scripts/build.py | 7 ++-----
bob/devtools/scripts/ci.py | 4 ----
bob/devtools/scripts/test.py | 8 ++------
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/bob/devtools/scripts/build.py b/bob/devtools/scripts/build.py
index 450d99ef..9d2a9659 100644
--- a/bob/devtools/scripts/build.py
+++ b/bob/devtools/scripts/build.py
@@ -67,9 +67,6 @@ Examples:
@click.option('-X', '--stable/--no-stable', default=False,
help='Set this to **exclude** beta channels from your build - ' \
'notice this option has no effect if you also pass --condarc')
-@click.option('-L', '--use-local/--no-use-local', default=False,
- help='Set this to **include** the locally built packages on the search ' \
- 'list - notice this option has no effect if you also pass --condarc')
@click.option('-d', '--dry-run/--no-dry-run', default=False,
help='Only goes through the actions, but does not execute them ' \
'(combine with the verbosity flags - e.g. ``-vvv``) to enable ' \
@@ -79,7 +76,7 @@ Examples:
@verbosity_option()
@bdt.raise_on_error
def build(recipe_dir, python, condarc, config, no_test, append_file,
- server, group, private, stable, use_local, dry_run, ci):
+ server, group, private, stable, dry_run, ci):
"""Builds package through conda-build with stock configuration
This command wraps the execution of conda-build so that you use the same
@@ -107,7 +104,7 @@ def build(recipe_dir, python, condarc, config, no_test, append_file,
condarc_options = yaml.load(f, Loader=yaml.FullLoader)
else:
# use default and add channels
- all_channels = ['local'] if use_local else []
+ all_channels = []
all_channels += channels + ['defaults']
condarc_options = yaml.load(BASE_CONDARC, Loader=yaml.FullLoader)
logger.info('Using the following channels during build:\n - %s',
diff --git a/bob/devtools/scripts/ci.py b/bob/devtools/scripts/ci.py
index 7abbef3b..8e24930f 100644
--- a/bob/devtools/scripts/ci.py
+++ b/bob/devtools/scripts/ci.py
@@ -342,7 +342,6 @@ def base_build(order, group, python, dry_run):
bootstrap=bootstrap,
server=SERVER,
intranet=True,
- use_local=True,
group=group,
recipe_dir=recipe,
conda_build_config=variants_file,
@@ -408,7 +407,6 @@ def test(ctx, dry_run):
group=group,
private=(os.environ['CI_PROJECT_VISIBILITY'] != 'public'),
stable='CI_COMMIT_TAG' in os.environ,
- use_local=False,
dry_run=dry_run,
ci=True,
)
@@ -472,7 +470,6 @@ def build(ctx, dry_run):
group=group,
private=(os.environ['CI_PROJECT_VISIBILITY'] != 'public'),
stable='CI_COMMIT_TAG' in os.environ,
- use_local=False,
dry_run=dry_run,
ci=True,
)
@@ -603,7 +600,6 @@ def nightlies(ctx, order, dry_run):
group=group,
private=private,
stable=stable,
- use_local=True,
dry_run=dry_run,
ci=True,
)
diff --git a/bob/devtools/scripts/test.py b/bob/devtools/scripts/test.py
index f02fbb8b..e2eb6a4f 100644
--- a/bob/devtools/scripts/test.py
+++ b/bob/devtools/scripts/test.py
@@ -58,9 +58,6 @@ Examples:
@click.option('-X', '--stable/--no-stable', default=False,
help='Set this to **exclude** beta channels from your build - ' \
'notice this option has no effect if you also pass --condarc')
-@click.option('-L', '--use-local/--no-use-local', default=False,
- help='Set this to **include** the locally built packages on the search ' \
- 'list - notice this option has no effect if you also pass --condarc')
@click.option('-d', '--dry-run/--no-dry-run', default=False,
help='Only goes through the actions, but does not execute them ' \
'(combine with the verbosity flags - e.g. ``-vvv``) to enable ' \
@@ -69,8 +66,7 @@ Examples:
help='Use this flag to indicate the build will be running on the CI')
@verbosity_option()
@bdt.raise_on_error
-def test(package, condarc, config, append_file, server, group, private, stable,
- use_local, dry_run, ci):
+def test(package, condarc, config, append_file, server, group, private, stable, dry_run, ci):
"""Tests (pre-built) package through conda-build with stock configuration
This command wraps the execution of conda-build so that you use the same
@@ -96,7 +92,7 @@ def test(package, condarc, config, append_file, server, group, private, stable,
condarc_options = yaml.load(f, Loader=yaml.FullLoader)
else:
# use default and add channels
- all_channels = ['local'] if use_local else []
+ all_channels = []
all_channels += channels + ['defaults']
condarc_options = yaml.load(BASE_CONDARC, Loader=yaml.FullLoader)
logger.info('Using the following channels during build:\n - %s',
--
GitLab