Bump version

Running 'pip install --upgrade setuptools' with 'sudo' on macOS, fixing #122

README.md

@@ -49,7 +49,7 @@ Usage
           env: PIP=pip2
 
     script:
-      - $PIP install cibuildwheel==0.10.0
+      - $PIP install cibuildwheel==0.10.1
       - cibuildwheel --output-dir wheelhouse
     ```
 
@@ -106,7 +106,7 @@ Usage
 
     ```
     build_script:
-      - pip install cibuildwheel==0.10.0
+      - pip install cibuildwheel==0.10.1
       - cibuildwheel --output-dir wheelhouse
     artifacts:
       - path: "wheelhouse\\*.whl"
@@ -394,6 +394,7 @@ Here are some repos that use cibuildwheel.
 - [pybase64](https://github.com/mayeut/pybase64)
 - [KDEpy](https://github.com/tommyod/KDEpy)
 - [AutoPy](https://github.com/autopilot-rs/autopy)
+- [apriltags2-ethz](https://github.com/safijari/apriltags2_ethz)
 
 > Add repo here! Send a PR.
 
@@ -582,4 +583,6 @@ Massive props also to-
 See also
 --------
 
+If you'd like to keep wheel building separate from the package itself, check out [astrofrog/autowheel](https://github.com/astrofrog/autowheel). It builds packages using cibuildwheel from source distributions on PyPI.
+
 If `cibuildwheel` is too limited for your needs, consider [matthew-brett/multibuild](http://github.com/matthew-brett/multibuild). `multibuild` is a toolbox for building a wheel on various platforms. It can do a lot more than this project - it's used to build SciPy!

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = '0.10.0'
+__version__ = '0.10.1'

cibuildwheel/__main__.py

@@ -105,30 +105,12 @@ def main():
     # This needs to be passed on to the docker container in linux.py
     os.environ['CIBUILDWHEEL'] = '1'
 
-    try:
-        project_setup_py = os.path.join(project_dir, 'setup.py')
-        name_output = subprocess.check_output([sys.executable, project_setup_py, '--name'],
-                                              universal_newlines=True)
-        # the last line of output is the name
-        package_name = name_output.strip().splitlines()[-1]
-    except subprocess.CalledProcessError as err:
-        if not os.path.exists(project_setup_py):
-            print('cibuildwheel: Could not find setup.py at root of project', file=sys.stderr)
-            exit(2)
-        else:
-            print(err.output)
-            print('cibuildwheel: Failed to get name of the package. Command was %s' % err.cmd,
-                  file=sys.stderr)
-            exit(err.returncode)
-
-    if package_name == '' or package_name == 'UNKNOWN':
-        print('cibuildwheel: Invalid package name "%s". Check your setup.py' % package_name,
-              file=sys.stderr)
+    if not os.path.exists(os.path.join(project_dir, 'setup.py')):
+        print('cibuildwheel: Could not find setup.py at root of project', file=sys.stderr)
         exit(2)
 
     build_options = dict(
         project_dir=project_dir,
-        package_name=package_name,
         output_dir=output_dir,
         test_command=test_command,
         test_requires=test_requires,
@@ -180,7 +162,7 @@ def print_preamble(platform, build_options):
 
     print('Build options:')
     print('  platform: %r' % platform)
-    for option, value in build_options.items():
+    for option, value in sorted(build_options.items()):
         print('  %s: %r' % (option, value))
 
     warnings = detect_warnings(platform, build_options)

cibuildwheel/linux.py

@@ -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, build_verbosity, build_selector, environment, manylinux1_images):
+def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment, manylinux1_images):
     try:
         subprocess.check_call(['docker', '--version'])
     except:
@@ -102,7 +102,6 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
                 chown {uid}:{gid} "/output/$(basename "$delocated_wheel")"
             done
         '''.format(
-            package_name=package_name,
             pybin_paths=' '.join(c.path+'/bin' for c in platform_configs),
             test_requires=' '.join(test_requires),
             test_command=shlex_quote(
@@ -122,15 +121,15 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
             if stdin_str is None:
                 subprocess.check_call(['docker'] + command)
             else:
-                process = subprocess.Popen(['docker'] + command,
-                                           stdin=subprocess.PIPE, universal_newlines=True)
+                args = ['docker'] + command
+                process = subprocess.Popen(args, stdin=subprocess.PIPE, universal_newlines=True)
                 try:
                     process.communicate(stdin_str)
                 except KeyboardInterrupt:
                     process.kill()
                     process.wait()
                 if process.returncode != 0:
-                    raise subprocess.CalledProcessError(process.returncode, process.args)
+                    raise subprocess.CalledProcessError(process.returncode, args)
 
         container_name = 'cibuildwheel-{}'.format(uuid.uuid4())
         try:

cibuildwheel/macos.py

@@ -10,14 +10,14 @@ except ImportError:
 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, build_selector, environment):
+def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, 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.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.6/python-3.6.6-macosx10.6.pkg'),
-        PythonConfiguration(version='3.7', identifier='cp37-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.7.0/python-3.7.0-macosx10.6.pkg'),
+        PythonConfiguration(version='3.6', identifier='cp36-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.6.pkg'),
+        PythonConfiguration(version='3.7', identifier='cp37-macosx_10_6_intel', url='https://www.python.org/ftp/python/3.7.2/python-3.7.2-macosx10.6.pkg'),
     ]
     get_pip_url = 'https://bootstrap.pypa.io/get-pip.py'
     get_pip_script = '/tmp/get-pip.py'
@@ -55,7 +55,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
             call(['sudo', 'installer', '-pkg', '/tmp/Python.pkg', '-target', '/'])
             # patch open ssl
             if config.version in ('3.4', '3.5'):
-                call(['curl', '-fsSLo', '/tmp/python-patch.tar.gz', 'https://github.com/mayeut/patch-macos-python-openssl/releases/download/v0.1.0/patch-macos-python-%s-openssl-v0.1.0.tar.gz' % config.version])
+                call(['curl', '-fsSLo', '/tmp/python-patch.tar.gz', 'https://github.com/mayeut/patch-macos-python-openssl/releases/download/v1.0.2q/patch-macos-python-%s-openssl-v1.0.2q.tar.gz' % config.version])
                 call(['sudo', 'tar', '-C', '/Library/Frameworks/Python.framework/Versions/%s/' % config.version, '-xmf', '/tmp/python-patch.tar.gz'])
 
         installation_bin_path = '/Library/Frameworks/Python.framework/Versions/{}/bin'.format(config.version)
@@ -86,7 +86,8 @@ 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)
+        # sudo required, because the removal of the old version of setuptools might cause problems with newer pip versions (see issue #122)
+        call(['sudo', 'pip', 'install', '--upgrade', 'setuptools'], env=env)
         call(['pip', 'install', 'wheel'], env=env)
         call(['pip', 'install', 'delocate'], env=env)
 

cibuildwheel/windows.py

@@ -10,7 +10,7 @@ from glob import glob
 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, build_selector, environment):
+def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment):
     # run_with_env is a cmd file that sets the right environment variables to
     run_with_env = os.path.join(tempfile.gettempdir(), 'appveyor_run_with_env.cmd')
     if not os.path.exists(run_with_env):

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.10.0
+current_version = 0.10.1
 commit = True
 tag = True
 message = Bump version

setup.py

@@ -8,7 +8,7 @@ except ImportError:
 
 setup(
     name='cibuildwheel',
-    version='0.10.0',
+    version='0.10.1',
     install_requires=['bashlex'],
     description="Build Python wheels on CI with minimal configuration.",
     long_description='For readme please see http://github.com/joerick/cibuildwheel',

test/03_before_build/setup.py

@@ -1,24 +1,23 @@
 from setuptools import setup, Extension
 import sys, os
 
-if sys.argv[-1] != '--name':
-    # assert that the Python version as written to pythonversion.txt in the CIBW_BEFORE_BUILD step
-    # is the same one as is currently running.
-    version_file = 'c:\\pythonversion.txt' if sys.platform == 'win32' else '/tmp/pythonversion.txt'
-    with open(version_file) as f:
-        stored_version = f.read()
-    print('stored_version', stored_version)
-    print('sys.version', sys.version)
-    assert stored_version == sys.version
+# assert that the Python version as written to pythonversion.txt in the CIBW_BEFORE_BUILD step
+# is the same one as is currently running.
+version_file = 'c:\\pythonversion.txt' if sys.platform == 'win32' else '/tmp/pythonversion.txt'
+with open(version_file) as f:
+    stored_version = f.read()
+print('stored_version', stored_version)
+print('sys.version', sys.version)
+assert stored_version == sys.version
 
-    # check that the executable also was written
-    executable_file = 'c:\\pythonexecutable.txt' if sys.platform == 'win32' else '/tmp/pythonexecutable.txt'
-    with open(executable_file) as f:
-        stored_executable = f.read()
-    print('stored_executable', stored_executable)
-    print('sys.executable', sys.executable)
-    # windows/mac are case insensitive
-    assert os.path.realpath(stored_executable).lower() == os.path.realpath(sys.executable).lower()
+# check that the executable also was written
+executable_file = 'c:\\pythonexecutable.txt' if sys.platform == 'win32' else '/tmp/pythonexecutable.txt'
+with open(executable_file) as f:
+    stored_executable = f.read()
+print('stored_executable', stored_executable)
+print('sys.executable', sys.executable)
+# windows/mac are case insensitive
+assert os.path.realpath(stored_executable).lower() == os.path.realpath(sys.executable).lower()
 
 setup(
     name="spam",

test/04_build_skip/setup.py

@@ -1,12 +1,11 @@
 from setuptools import setup, Extension
 import sys
 
-if sys.argv[-1] != '--name':
-    # explode if run on Python 2.7 or Python 3.4 (these should be skipped)
-    if sys.version_info[0:2] == (2, 7):
-        raise Exception('Python 2.7 should not be built')
-    if sys.version_info[0:2] == (3, 4):
-        raise Exception('Python 3.4 should be skipped')
+# explode if run on Python 2.7 or Python 3.4 (these should be skipped)
+if sys.version_info[0:2] == (2, 7):
+    raise Exception('Python 2.7 should not be built')
+if sys.version_info[0:2] == (3, 4):
+    raise Exception('Python 3.4 should be skipped')
 
 setup(
     name="spam",

test/05_environment/setup.py

@@ -1,20 +1,19 @@
 from setuptools import setup, Extension
 import sys, os
 
-if sys.argv[-1] != '--name':
-    # explode if environment isn't correct, as set in CIBW_ENVIRONMENT
-    CIBW_TEST_VAR = os.environ.get('CIBW_TEST_VAR')
-    CIBW_TEST_VAR_2 = os.environ.get('CIBW_TEST_VAR_2')
-    PATH = os.environ.get('PATH')
+# explode if environment isn't correct, as set in CIBW_ENVIRONMENT
+CIBW_TEST_VAR = os.environ.get('CIBW_TEST_VAR')
+CIBW_TEST_VAR_2 = os.environ.get('CIBW_TEST_VAR_2')
+PATH = os.environ.get('PATH')
 
-    if CIBW_TEST_VAR != 'a b c':
-        raise Exception('CIBW_TEST_VAR should equal "a b c". It was "%s"' % CIBW_TEST_VAR)
-    if CIBW_TEST_VAR_2 != '1':
-        raise Exception('CIBW_TEST_VAR_2 should equal "1". It was "%s"' % CIBW_TEST_VAR_2)
-    if '/opt/cibw_test_path' not in PATH:
-        raise Exception('PATH should contain "/opt/cibw_test_path". It was "%s"' % PATH)
-    if '$PATH' in PATH:
-        raise Exception('$PATH should be expanded in PATH. It was "%s"' % PATH)
+if CIBW_TEST_VAR != 'a b c':
+    raise Exception('CIBW_TEST_VAR should equal "a b c". It was "%s"' % CIBW_TEST_VAR)
+if CIBW_TEST_VAR_2 != '1':
+    raise Exception('CIBW_TEST_VAR_2 should equal "1". It was "%s"' % CIBW_TEST_VAR_2)
+if '/opt/cibw_test_path' not in PATH:
+    raise Exception('PATH should contain "/opt/cibw_test_path". It was "%s"' % PATH)
+if '$PATH' in PATH:
+    raise Exception('$PATH should be expanded in PATH. It was "%s"' % PATH)
 
 
 setup(

test/06_docker_images/setup.py

@@ -2,11 +2,10 @@ import os, sys
 
 from setuptools import setup, Extension
 
-if sys.argv[-1] != '--name':
-    # check that we're running in the correct docker image as specified in the
-    # environment options CIBW_MANYLINUX1_*_IMAGE
-    if 'linux' in sys.platform and not os.path.exists('/dockcross'):
-        raise Exception('/dockcross directory not found. Is this test running in the correct docker image?')
+# check that we're running in the correct docker image as specified in the
+# environment options CIBW_MANYLINUX1_*_IMAGE
+if 'linux' in sys.platform and not os.path.exists('/dockcross'):
+    raise Exception('/dockcross directory not found. Is this test running in the correct docker image?')
 
 setup(
     name="spam",