From a2e08bf6aa025e932c5f6f16478e1e1e866fe877 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 18 Apr 2019 10:47:44 +0200
Subject: [PATCH] Avoid deploy deletes, so tight loop package builds work
---
bob/devtools/build.py | 8 --------
bob/devtools/deploy.py | 3 ---
bob/devtools/scripts/build.py | 7 -------
bob/devtools/scripts/test.py | 8 --------
4 files changed, 26 deletions(-)
diff --git a/bob/devtools/build.py b/bob/devtools/build.py
index 224d0f13..17718c81 100644
--- a/bob/devtools/build.py
+++ b/bob/devtools/build.py
@@ -522,14 +522,6 @@ def base_build(bootstrap, server, intranet, use_local, group, recipe_dir,
'\n - '.join(all_channels))
condarc_options['channels'] = all_channels
- # updates the local index to get fresh packages if required
- if use_local:
- prefix = get_env_directory(os.environ['CONDA_EXE'], 'base')
- conda_bld = os.path.join(prefix, 'conda-bld')
- if os.path.exists(conda_bld):
- logger.info('Re-indexing %s', conda_bld)
- conda_build.api.update_index(conda_bld)
-
logger.info('Merging conda configuration files...')
if python_version not in ('noarch', None):
conda_config = make_conda_config(conda_build_config, python_version,
diff --git a/bob/devtools/deploy.py b/bob/devtools/deploy.py
index 0682eba1..d2f12b69 100644
--- a/bob/devtools/deploy.py
+++ b/bob/devtools/deploy.py
@@ -77,9 +77,6 @@ def deploy_conda_package(package, arch, stable, public, username, password,
if not dry_run:
davclient.upload(local_path=package, remote_path=remote_path)
- logger.debug('Removing local copy (%s) to avoid re-uploads', package)
- os.unlink(package)
-
def deploy_documentation(path, package, stable, public, branch, tag, username,
password, dry_run):
diff --git a/bob/devtools/scripts/build.py b/bob/devtools/scripts/build.py
index e8498b20..450d99ef 100644
--- a/bob/devtools/scripts/build.py
+++ b/bob/devtools/scripts/build.py
@@ -118,13 +118,6 @@ def build(recipe_dir, python, condarc, config, no_test, append_file,
prefix = get_env_directory(os.environ['CONDA_EXE'], 'base')
condarc_options['croot'] = os.path.join(prefix, 'conda-bld')
- # updates the local index to get fresh packages if required
- if use_local:
- conda_bld = os.path.join(prefix, 'conda-bld')
- if os.path.exists(conda_bld):
- logger.info('Re-indexing %s', conda_bld)
- conda_build.api.update_index(conda_bld)
-
conda_config = make_conda_config(config, python, append_file,
condarc_options)
diff --git a/bob/devtools/scripts/test.py b/bob/devtools/scripts/test.py
index c14f2f31..f02fbb8b 100644
--- a/bob/devtools/scripts/test.py
+++ b/bob/devtools/scripts/test.py
@@ -103,14 +103,6 @@ def test(package, condarc, config, append_file, server, group, private, stable,
'\n - '.join(all_channels))
condarc_options['channels'] = all_channels
- # updates the local index to get fresh packages if required
- if use_local and not dry_run:
- prefix = get_env_directory(os.environ['CONDA_EXE'], 'base')
- conda_bld = os.path.join(prefix, 'conda-bld')
- if os.path.exists(conda_bld):
- logger.info('Re-indexing %s', conda_bld)
- conda_build.api.update_index(conda_bld)
-
conda_config = make_conda_config(config, None, append_file,
condarc_options)
--
GitLab