Skip to content

Commit 84f1964

Browse files
committed
Adding support for building manylinux2010 wheels
1 parent c2d3dc3 commit 84f1964

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

cibuildwheel/__main__.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,10 @@ def main():
121121
)
122122

123123
if platform == 'linux':
124-
manylinux1_x86_64_image = os.environ.get('CIBW_MANYLINUX1_X86_64_IMAGE', None)
125-
manylinux1_i686_image = os.environ.get('CIBW_MANYLINUX1_I686_IMAGE', None)
126-
127124
build_options.update(
128-
manylinux1_images={'x86_64': manylinux1_x86_64_image, 'i686': manylinux1_i686_image},
125+
manylinux_images={'manylinux1_x86_64': os.environ.get('CIBW_MANYLINUX1_X86_64_IMAGE', None),
126+
'manylinux1_i686': os.environ.get('CIBW_MANYLINUX1_I686_IMAGE', None),
127+
'manylinux2010_x86_64': os.environ.get('CIBW_MANYLINUX2010_X86_64_IMAGE', None)},
129128
)
130129
elif platform == 'macos':
131130
pass

cibuildwheel/linux.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from pipes import quote as shlex_quote
1010

1111

12-
def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment, manylinux1_images):
12+
def build(project_dir, output_dir, test_command, test_requires, before_build, build_verbosity, build_selector, environment, manylinux_images):
1313
try:
1414
subprocess.check_call(['docker', '--version'])
1515
except:
@@ -33,14 +33,21 @@ def build(project_dir, output_dir, test_command, test_requires, before_build, bu
3333
PythonConfiguration(identifier='cp35-manylinux1_i686', path='/opt/python/cp35-cp35m'),
3434
PythonConfiguration(identifier='cp36-manylinux1_i686', path='/opt/python/cp36-cp36m'),
3535
PythonConfiguration(identifier='cp37-manylinux1_i686', path='/opt/python/cp37-cp37m'),
36+
PythonConfiguration(identifier='cp27-manylinux2010_x86_64', path='/opt/python/cp27-cp27m'),
37+
PythonConfiguration(identifier='cp27-manylinux2010_x86_64', path='/opt/python/cp27-cp27mu'),
38+
PythonConfiguration(identifier='cp34-manylinux2010_x86_64', path='/opt/python/cp34-cp34m'),
39+
PythonConfiguration(identifier='cp35-manylinux2010_x86_64', path='/opt/python/cp35-cp35m'),
40+
PythonConfiguration(identifier='cp36-manylinux2010_x86_64', path='/opt/python/cp36-cp36m'),
41+
PythonConfiguration(identifier='cp37-manylinux2010_x86_64', path='/opt/python/cp37-cp37m'),
3642
]
3743

3844
# skip builds as required
3945
python_configurations = [c for c in python_configurations if build_selector(c.identifier)]
4046

4147
platforms = [
42-
('manylinux1_x86_64', manylinux1_images.get('x86_64') or 'quay.io/pypa/manylinux1_x86_64'),
43-
('manylinux1_i686', manylinux1_images.get('i686') or 'quay.io/pypa/manylinux1_i686'),
48+
('manylinux1_x86_64', docker_images.get('manylinux1_x86_64') or 'quay.io/pypa/manylinux1_x86_64'),
49+
('manylinux1_i686', docker_images.get('manylinux1_i686') or 'quay.io/pypa/manylinux1_i686'),
50+
('manylinux2010_x86_64', docker_images.get('manylinux2010_x86_64') or 'quay.io/pypa/manylinux2010_x86_64'),
4451
]
4552

4653
for platform_tag, docker_image in platforms:
@@ -78,7 +85,7 @@ def build(project_dir, output_dir, test_command, test_requires, before_build, bu
7885
# pure python wheel - just copy
7986
mv "$built_wheel" /tmp/delocated_wheel
8087
else
81-
auditwheel repair "$built_wheel" -w /tmp/delocated_wheel
88+
auditwheel repair --plat {platform_tag} "$built_wheel" -w /tmp/delocated_wheel
8289
fi
8390
delocated_wheel=(/tmp/delocated_wheel/*.whl)
8491
@@ -112,6 +119,7 @@ def build(project_dir, output_dir, test_command, test_requires, before_build, bu
112119
),
113120
build_verbosity_flag=' '.join(get_build_verbosity_extra_flags(build_verbosity)),
114121
environment_exports='\n'.join(environment.as_shell_commands()),
122+
platform_tag=platform_tag,
115123
uid=os.getuid(),
116124
gid=os.getgid(),
117125
)

0 commit comments

Comments
 (0)