Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming util.get_build_verbosity_flag into util.get_build_verbosity_extra_flags

Browse Source
This commit is contained in:
Yannick Jadoul
2018-04-30 15:07:56 +02:00
parent 8d9d970874
commit eedcd62753
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/linux.py
+2 -2
View File
@@ -1,7 +1,7 @@
from __future__ import print_function from __future__ import print_function
import os, subprocess, sys import os, subprocess, sys
from collections import namedtuple from collections import namedtuple
from .util import prepare_command, get_build_verbosity_flag from .util import prepare_command, get_build_verbosity_extra_flags
try: try:
from shlex import quote as shlex_quote 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( before_build=shlex_quote(
prepare_command(before_build, python='python', pip='pip', project='/project') if before_build else '' 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()), environment_exports='\n'.join(environment.as_shell_commands()),
) )
cibuildwheel/macos.py
+2 -3
View File
@@ -7,7 +7,7 @@ try:
except ImportError: except ImportError:
from pipes import quote as shlex_quote 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): def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, skip, environment):
@@ -87,8 +87,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
call(before_build_prepared, env=env, shell=True) call(before_build_prepared, env=env, shell=True)
# build the wheel # build the wheel
build_verbosity_flag = get_build_verbosity_flag(build_verbosity) call([pip, 'wheel', abs_project_dir, '-w', '/tmp/built_wheel', '--no-deps'] + get_build_verbosity_extra_flags(build_verbosity), env=env)
call([pip, 'wheel', abs_project_dir, '-w', '/tmp/built_wheel', '--no-deps'] + ([build_verbosity_flag] if build_verbosity_flag else []), env=env)
built_wheel = glob('/tmp/built_wheel/*.whl')[0] built_wheel = glob('/tmp/built_wheel/*.whl')[0]
if built_wheel.endswith('none-any.whl'): if built_wheel.endswith('none-any.whl'):
cibuildwheel/util.py
+4 -4
View File
@@ -13,13 +13,13 @@ def prepare_command(command, python, pip, project):
return command.format(python=python, pip=pip, project=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: if level > 0:
return '-' + level * 'v' return ['-' + level * 'v']
elif level < 0: elif level < 0:
return '-' + -level * 'q' return ['-' + -level * 'q']
else: else:
return '' return []
class BuildSkipper(object): class BuildSkipper(object):
cibuildwheel/windows.py
+2 -3
View File
@@ -7,7 +7,7 @@ except ImportError:
from collections import namedtuple from collections import namedtuple
from glob import glob 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): def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, skip, environment):
@@ -82,8 +82,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
shell([before_build_prepared], env=env) shell([before_build_prepared], env=env)
# build the wheel # build the wheel
build_verbosity_flag = get_build_verbosity_flag(build_verbosity) shell(['pip', 'wheel', abs_project_dir, '-w', built_wheel_dir, '--no-deps'] + get_build_verbosity_extra_flags(build_verbosity), env=env)
shell(['pip', 'wheel', abs_project_dir, '-w', built_wheel_dir, '--no-deps'] + ([build_verbosity_flag] if build_verbosity_flag else []), env=env)
built_wheel = glob(built_wheel_dir+'/*.whl')[0] built_wheel = glob(built_wheel_dir+'/*.whl')[0]
# install the wheel # install the wheel