From 23a7e71f55a57f6967503c548105fd863d4f3268 Mon Sep 17 00:00:00 2001 From: Michael Sarahan Date: Fri, 27 Jul 2018 12:00:47 -0500 Subject: [PATCH 1/3] add option to omit local channel in is_package_built --- conda_build/build.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conda_build/build.py b/conda_build/build.py index 174dc2e796..f4c51cd513 100644 --- a/conda_build/build.py +++ b/conda_build/build.py @@ -2457,7 +2457,7 @@ def clean_build(config, folders=None): utils.rm_rf(folder) -def is_package_built(metadata, env): +def is_package_built(metadata, env, include_local=True): for d in metadata.config.bldpkgs_dirs: if not os.path.isdir(d): os.makedirs(d) @@ -2472,7 +2472,9 @@ def is_package_built(metadata, env): locking=metadata.config.locking, timeout=metadata.config.timeout, clear_cache=True) - urls = [url_path(metadata.config.output_folder), 'local'] + get_rc_urls() + + urls = [url_path(metadata.config.output_folder), 'local'] if include_local else [] + urls += get_rc_urls() if metadata.config.channel_urls: urls.extend(metadata.config.channel_urls) From 1b3726ffb098a210b7376e776784f1aba3211ea3 Mon Sep 17 00:00:00 2001 From: Michael Sarahan Date: Fri, 27 Jul 2018 13:02:54 -0500 Subject: [PATCH 2/3] fix conda-verify import error warning showing up in --output text --- conda_build/build.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conda_build/build.py b/conda_build/build.py index 174dc2e796..d73311b859 100644 --- a/conda_build/build.py +++ b/conda_build/build.py @@ -71,14 +71,6 @@ from conda_build.create_test import create_all_test_files import conda_build.noarch_python as noarch_python -try: - from conda_verify.verify import Verify -except ImportError: - Verify = None - print("=" * 60) - print("Warning: Importing conda-verify failed. Please be sure to test your packages. " - "conda install conda-verify to make this message go away.") - print("=" * 60) from conda import __version__ as conda_version from conda_build import __version__ as conda_build_version @@ -984,6 +976,14 @@ def order(f): # we're done building, perform some checks tarcheck.check_all(tmp_path, metadata.config) + + # we do the import here because we want to respect logger level context + try: + from conda_verify.verify import Verify + except ImportError: + Verify = None + log.warn("Importing conda-verify failed. Please be sure to test your packages. " + "conda install conda-verify to make this message go away.") if getattr(metadata.config, "verify", False) and Verify: verifier = Verify() checks_to_ignore = metadata.config.ignore_verify_codes if \ From f20f5071d996a1cb11536c034b26ad3b3e658d58 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 28 Jul 2018 12:41:59 +0100 Subject: [PATCH 3/3] skeleton (RPM): Update to CentOS 6.10 --- conda_build/skeletons/rpm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conda_build/skeletons/rpm.py b/conda_build/skeletons/rpm.py index 111cf50577..693e9f2c86 100644 --- a/conda_build/skeletons/rpm.py +++ b/conda_build/skeletons/rpm.py @@ -121,9 +121,9 @@ 'macros': {}}, 'centos6': {'dirname': 'centos6', 'short_name': 'cos6', - 'base_url': 'http://mirror.centos.org/centos/6.9/os/{base_architecture}/CentOS/', # noqa - 'sbase_url': 'http://vault.centos.org/6.9/os/Source/SPackages/', - 'repomd_url': 'http://mirror.centos.org/centos/6.9/os/{base_architecture}/repodata/repomd.xml', # noqa + 'base_url': 'http://mirror.centos.org/centos/6.10/os/{base_architecture}/CentOS/', # noqa + 'sbase_url': 'http://vault.centos.org/6.10/os/Source/SPackages/', + 'repomd_url': 'http://mirror.centos.org/centos/6.10/os/{base_architecture}/repodata/repomd.xml', # noqa 'host_machine': '{architecture}-conda_cos6-linux-gnu', 'host_subdir': 'linux-{bits}', 'fname_architecture': '{architecture}',