Skip to content

Commit 5b7f105

Browse files
authored
Merge pull request #14 from tgarc/master
minor fixes including python3 fix
2 parents c28e85d + b5006fc commit 5b7f105

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

cibuildwheel/__main__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ def main():
7777

7878
try:
7979
project_setup_py = os.path.join(project_dir, 'setup.py')
80-
name_output = subprocess.check_output([sys.executable, project_setup_py, '--name'])
80+
name_output = subprocess.check_output([sys.executable, project_setup_py, '--name'],
81+
universal_newlines=True)
8182
# the last line of output is the name
8283
package_name = name_output.strip().splitlines()[-1]
8384
except subprocess.CalledProcessError as err:

cibuildwheel/linux.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
4646

4747
for platform_tag, docker_image in platforms:
4848
platform_configs = [c for c in python_configurations if c.identifier.endswith(platform_tag)]
49+
if not platform_configs:
50+
continue
4951

5052
bash_script = '''
5153
set -o errexit
@@ -113,7 +115,11 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
113115
'/bin/bash'],
114116
stdin=subprocess.PIPE, universal_newlines=True)
115117

116-
docker_process.communicate(bash_script)
118+
try:
119+
docker_process.communicate(bash_script)
120+
except KeyboardInterrupt:
121+
docker_process.kill()
122+
docker_process.wait()
117123

118124
if docker_process.returncode != 0:
119125
exit(1)

0 commit comments

Comments
 (0)