From eedcd62753996dd8d085b721269297d3bba81df1 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Mon, 30 Apr 2018 15:07:48 +0200 Subject: [PATCH] Renaming util.get_build_verbosity_flag into util.get_build_verbosity_extra_flags --- cibuildwheel/linux.py | 4 ++-- cibuildwheel/macos.py | 5 ++--- cibuildwheel/util.py | 8 ++++---- cibuildwheel/windows.py | 5 ++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index c02a0fcac..c3616eab9 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -1,7 +1,7 @@ from __future__ import print_function import os, subprocess, sys from collections import namedtuple -from .util import prepare_command, get_build_verbosity_flag +from .util import prepare_command, get_build_verbosity_extra_flags try: from shlex import quote as shlex_quote @@ -108,7 +108,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be before_build=shlex_quote( prepare_command(before_build, python='python', pip='pip', project='/project') if before_build else '' ), - build_verbosity_flag=get_build_verbosity_flag(build_verbosity), + build_verbosity_flag=' '.join(get_build_verbosity_extra_flags(build_verbosity)), environment_exports='\n'.join(environment.as_shell_commands()), ) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index a8ea4d741..4462c7818 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -7,7 +7,7 @@ except ImportError: from pipes import quote as shlex_quote -from .util import prepare_command, get_build_verbosity_flag +from .util import prepare_command, get_build_verbosity_extra_flags def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, skip, environment): @@ -87,8 +87,7 @@ def call(args, env=None, cwd=None, shell=False): call(before_build_prepared, env=env, shell=True) # build the wheel - build_verbosity_flag = get_build_verbosity_flag(build_verbosity) - call([pip, 'wheel', abs_project_dir, '-w', '/tmp/built_wheel', '--no-deps'] + ([build_verbosity_flag] if build_verbosity_flag else []), env=env) + call([pip, 'wheel', abs_project_dir, '-w', '/tmp/built_wheel', '--no-deps'] + get_build_verbosity_extra_flags(build_verbosity), env=env) built_wheel = glob('/tmp/built_wheel/*.whl')[0] if built_wheel.endswith('none-any.whl'): diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index fe3a5ac05..fe73a5c89 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -13,13 +13,13 @@ def prepare_command(command, python, pip, project): return command.format(python=python, pip=pip, project=project) -def get_build_verbosity_flag(level): +def get_build_verbosity_extra_flags(level): if level > 0: - return '-' + level * 'v' + return ['-' + level * 'v'] elif level < 0: - return '-' + -level * 'q' + return ['-' + -level * 'q'] else: - return '' + return [] class BuildSkipper(object): diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index ad1bd61c5..0663d81c7 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -7,7 +7,7 @@ from collections import namedtuple from glob import glob -from .util import prepare_command, get_build_verbosity_flag, Unbuffered +from .util import prepare_command, get_build_verbosity_extra_flags, Unbuffered def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, skip, environment): @@ -82,8 +82,7 @@ def shell(args, env=None, cwd=None): shell([before_build_prepared], env=env) # build the wheel - build_verbosity_flag = get_build_verbosity_flag(build_verbosity) - shell(['pip', 'wheel', abs_project_dir, '-w', built_wheel_dir, '--no-deps'] + ([build_verbosity_flag] if build_verbosity_flag else []), env=env) + shell(['pip', 'wheel', abs_project_dir, '-w', built_wheel_dir, '--no-deps'] + get_build_verbosity_extra_flags(build_verbosity), env=env) built_wheel = glob(built_wheel_dir+'/*.whl')[0] # install the wheel