diff --git a/.travis.yml b/.travis.yml index a9d61238..a38e2362 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,42 +5,28 @@ matrix: # Linux Python 2 - sudo: required language: python - services: - - docker - env: - - "PYTHON=python2" + python: 2.7 + services: docker + env: PYTHON=python # Linux Python 3 - sudo: required language: python - services: - - docker - env: - - "PYTHON=python3" - before_install: - - sudo apt-get -qq update - - sudo apt-get install -y python3-pip + python: 3.4 + services: docker + env: PYTHON=python # macOS Python 2 - os: osx - env: - - "PYTHON=python2" + env: PYTHON=python2 # macOS Python 3 - os: osx - env: - - "PYTHON=python3" + env: PYTHON=python3 before_install: - brew update - brew outdated python || brew upgrade python -script: - - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - $PYTHON -m pip install -r requirements-dev.txt - $PYTHON ./bin/run_tests.py - else - # linux test requires root to clean up the wheelhouse (docker runs as root) - sudo $PYTHON -m pip install -r requirements-dev.txt - sudo $PYTHON ./bin/run_tests.py - fi +install: $PYTHON -m pip install -r requirements-dev.txt + +script: $PYTHON ./bin/run_tests.py diff --git a/README.md b/README.md index ebb1ba7d..4393b5b5 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ What does it do? | | macOS 10.6+ | manylinux i686 | manylinux x86_64 | Windows 32bit | Windows 64bit | |---|---|---|---|---|---| | Python 2.7 | ✅ | ✅ | ✅ | ✅ | ✅ | -| Python 3.3 | | ✅ | ✅ | ✅ | ✅ | +| Python 3.3 | | | | ✅ | ✅ | | Python 3.4 | ✅ | ✅ | ✅ | ✅ | ✅ | | Python 3.5 | ✅ | ✅ | ✅ | ✅ | ✅ | | Python 3.6 | ✅ | ✅ | ✅ | ✅ | ✅ | @@ -49,7 +49,7 @@ Usage env: PIP=pip2 script: - - $PIP install cibuildwheel==0.7.1 + - $PIP install cibuildwheel==0.8.0 - cibuildwheel --output-dir wheelhouse ``` @@ -59,7 +59,7 @@ Usage ``` build_script: - - pip install cibuildwheel==0.7.1 + - pip install cibuildwheel==0.8.0 - cibuildwheel --output-dir wheelhouse artifacts: - path: "wheelhouse\\*.whl" @@ -82,6 +82,7 @@ All being well, you should get wheels delivered to you in a few minutes. |---|---|---| | **Target wheels** | `CIBW_PLATFORM` | Override the auto-detected target platform | | | `CIBW_SKIP` | Skip certain Python versions | +| **Build parameters** | `CIBW_BUILD_VERBOSITY` | Increase or decrease the output of `pip wheel` | | **Build environment** | `CIBW_ENVIRONMENT` | Set environment variables needed during the build | | | `CIBW_BEFORE_BUILD` | Execute a shell command preparing each wheel's build | | | `CIBW_MANYLINUX1_X86_64_IMAGE` | Specify an alternative manylinx1 x86_64 docker image | @@ -166,6 +167,16 @@ Examples: - Skip Python 3.6 on Linux: `cp36-manylinux*` - Only build on Python 3.6: `cp27-* cp34-* cp35-*` +| Environment variable: `CIBW_BUILD_VERBOSITY` +| --- + +Optional. + +An number from 1 to 3 to increase the level of verbosity (corresponding to invoking pip with `-v`, `-vv`, and `-vvv`), between -1 and -3 (`-q`, `-qq`, and `-qqq`), or just 0 (default verbosity). These flags are useful while debugging a build when the output of the actual build invoked by `pip wheel` is required. + +Platform-specific variants also available: +`CIBW_BUILD_VERBOSITY_MACOS` | `CIBW_BUILD_VERBOSITY_WINDOWS` | `CIBW_BUILD_VERBOSITY_LINUX` + | Environment variable: `CIBW_ENVIRONMENT` | --- @@ -317,6 +328,11 @@ Since `cibuildwheel` runs the wheel through delocate or auditwheel, it will auto Changelog ========= +### 0.8.0 + +- Drop support for Python 3.3 on Linux (#67) +- Fix TLS by updating setuptools (#69) + ### 0.7.1 - macOS: Fix Pip bugs resulting from PyPI TLS 1.2 enforcement diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index f0788a87..32a90a3b 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = '0.7.1' +__version__ = '0.8.0' diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index bdc76287..775a20e2 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -74,9 +74,15 @@ def main(): test_requires = os.environ.get('CIBW_TEST_REQUIRES', '').split() project_dir = args.project_dir before_build = get_option_from_environment('CIBW_BEFORE_BUILD', platform=platform) + build_verbosity = get_option_from_environment('CIBW_BUILD_VERBOSITY', platform=platform) or '' skip_config = os.environ.get('CIBW_SKIP', '') environment_config = get_option_from_environment('CIBW_ENVIRONMENT', platform=platform) or '' + try: + build_verbosity = min(3, max(-3, int(build_verbosity))) + except ValueError: + build_verbosity = 0 + try: environment = parse_environment(environment_config) except (EnvironmentParseError, ValueError) as e: @@ -118,6 +124,7 @@ def main(): test_command=test_command, test_requires=test_requires, before_build=before_build, + build_verbosity=build_verbosity, skip=skip, environment=environment, ) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index b51be81c..cdc703bc 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 +from .util import prepare_command, get_build_verbosity_extra_flags try: from shlex import quote as shlex_quote @@ -9,7 +9,7 @@ except ImportError: from pipes import quote as shlex_quote -def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, skip, environment, manylinux1_images): +def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, skip, environment, manylinux1_images): try: subprocess.check_call(['docker', '--version']) except: @@ -22,13 +22,11 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be python_configurations = [ PythonConfiguration(identifier='cp27-manylinux1_x86_64', path='/opt/python/cp27-cp27m'), PythonConfiguration(identifier='cp27-manylinux1_x86_64', path='/opt/python/cp27-cp27mu'), - PythonConfiguration(identifier='cp33-manylinux1_x86_64', path='/opt/python/cp33-cp33m'), PythonConfiguration(identifier='cp34-manylinux1_x86_64', path='/opt/python/cp34-cp34m'), PythonConfiguration(identifier='cp35-manylinux1_x86_64', path='/opt/python/cp35-cp35m'), PythonConfiguration(identifier='cp36-manylinux1_x86_64', path='/opt/python/cp36-cp36m'), PythonConfiguration(identifier='cp27-manylinux1_i686', path='/opt/python/cp27-cp27m'), PythonConfiguration(identifier='cp27-manylinux1_i686', path='/opt/python/cp27-cp27mu'), - PythonConfiguration(identifier='cp33-manylinux1_i686', path='/opt/python/cp33-cp33m'), PythonConfiguration(identifier='cp34-manylinux1_i686', path='/opt/python/cp34-cp34m'), PythonConfiguration(identifier='cp35-manylinux1_i686', path='/opt/python/cp35-cp35m'), PythonConfiguration(identifier='cp36-manylinux1_i686', path='/opt/python/cp36-cp36m'), @@ -66,7 +64,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be fi # Build that wheel - PATH="$PYBIN:$PATH" "$PYBIN/pip" wheel . -w /tmp/built_wheel --no-deps + PATH="$PYBIN:$PATH" "$PYBIN/pip" wheel . -w /tmp/built_wheel --no-deps {build_verbosity_flag} built_wheel=(/tmp/built_wheel/*.whl) # Delocate the wheel @@ -97,6 +95,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be # we're all done here; move it to output mv "$delocated_wheel" /output + chown {uid}:{gid} "/output/$(basename "$delocated_wheel")" done '''.format( package_name=package_name, @@ -108,7 +107,10 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be before_build=shlex_quote( prepare_command(before_build, project='/project') if before_build else '' ), + build_verbosity_flag=' '.join(get_build_verbosity_extra_flags(build_verbosity)), environment_exports='\n'.join(environment.as_shell_commands()), + uid=os.getuid(), + gid=os.getgid(), ) docker_process = subprocess.Popen([ diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 45cb178a..4072958d 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -7,13 +7,13 @@ try: except ImportError: from pipes import quote as shlex_quote -from .util import prepare_command +from .util import prepare_command, get_build_verbosity_extra_flags -def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, skip, environment): +def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, skip, environment): PythonConfiguration = namedtuple('PythonConfiguration', ['version', 'identifier', 'url']) python_configurations = [ - PythonConfiguration(version='2.7', identifier='cp27-macosx_10_6_intel', url='https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg'), + PythonConfiguration(version='2.7', identifier='cp27-macosx_10_6_intel', url='https://www.python.org/ftp/python/2.7.15/python-2.7.15-macosx10.6.pkg'), PythonConfiguration(version='3.4', identifier='cp34-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.4.4/python-3.4.4-macosx10.6.pkg'), PythonConfiguration(version='3.5', identifier='cp35-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'), PythonConfiguration(version='3.6', identifier='cp36-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.6.5/python-3.6.5-macosx10.6.pkg'), @@ -81,6 +81,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be # install pip & wheel call(['python', get_pip_script, '--no-setuptools', '--no-wheel'], env=env) call(['pip', '--version'], env=env) + call(['pip', 'install', '--upgrade', 'setuptools'], env=env) call(['pip', 'install', 'wheel'], env=env) call(['pip', 'install', 'delocate'], env=env) @@ -98,7 +99,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be call(before_build_prepared, env=env, shell=True) # build the wheel - call(['pip', 'wheel', abs_project_dir, '-w', '/tmp/built_wheel', '--no-deps'], 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 fc74ef65..7db3edaa 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -12,6 +12,15 @@ def prepare_command(command, project): return command.format(python='python', pip='pip', project=project) +def get_build_verbosity_extra_flags(level): + if level > 0: + return ['-' + level * 'v'] + elif level < 0: + return ['-' + -level * 'q'] + else: + return [] + + class BuildSkipper(object): def __init__(self, skip_config): self.patterns = skip_config.split() diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 1c3e5fbd..77bba341 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -7,10 +7,10 @@ except ImportError: from collections import namedtuple from glob import glob -from .util import prepare_command, 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, skip, environment): +def build(project_dir, package_name, output_dir, test_command, test_requires, before_build, build_verbosity, skip, environment): # Python under AppVeyor/Windows seems to be buffering by default, giving problems interleaving subprocess call output with unflushed calls to 'print' sys.stdout.flush() sys.stdout = Unbuffered(sys.stdout) @@ -72,8 +72,9 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be shell(['python', '-c', '"import struct; print(struct.calcsize(\'P\') * 8)\"'], env=env) # prepare the Python environment - shell(['pip', 'install', '--disable-pip-version-check', '--user', '--upgrade', 'pip'], + shell(['python', '-m', 'pip', 'install', '--upgrade', 'pip'], env=env) + shell(['pip', 'install', '--upgrade', 'setuptools'], env=env) shell(['pip', 'install', 'wheel'], env=env) # run the before_build command @@ -82,7 +83,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be shell([before_build_prepared], env=env) # build the wheel - shell(['pip', 'wheel', abs_project_dir, '-w', built_wheel_dir, '--no-deps'], 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 diff --git a/setup.cfg b/setup.cfg index a80029c6..caa72422 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.7.1 +current_version = 0.8.0 commit = True tag = True message = Bump version diff --git a/setup.py b/setup.py index da13557f..c0e1bd31 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ except ImportError: setup( name='cibuildwheel', - version='0.7.1', + version='0.8.0', install_requires=['bashlex'], description="Build Python wheels on CI with minimal configuration.", long_description='For readme please see http://github.com/joerick/cibuildwheel',