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

Merge pull request #464 from YannickJadoul/manylinux-python-version

Browse Source 
Ensure modern version of Python in CIBW_BEFORE_ALL on manylinux
This commit is contained in:
Joe Rickerby
2020-11-24 08:58:51 +00:00
committed by GitHub
parent 2f4ed1fafc 6f3fcf8b12
commit 6413732187
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/linux.py
+1 -1
View File
@@ -122,7 +122,7 @@ def build(options: BuildOptions) -> None:
if options.before_all: if options.before_all:
env = docker.get_environment() env = docker.get_environment()
env['PATH'] = f'/opt/python/cp38-cp38:{env["PATH"]}' env['PATH'] = f'/opt/python/cp38-cp38/bin:{env["PATH"]}'
env = options.environment.as_dictionary(env, executor=docker.environment_executor) env = options.environment.as_dictionary(env, executor=docker.environment_executor)
before_all_prepared = prepare_command(options.before_all, project=container_project_path, package=container_package_dir) before_all_prepared = prepare_command(options.before_all, project=container_project_path, package=container_package_dir)
test/test_before_all.py
+3 -1
View File
@@ -26,10 +26,12 @@ def test(tmp_path):
print("dummy text", file=ff) print("dummy text", file=ff)
# build the wheels # build the wheels
before_all_command = '''python -c "import os;open('{project}/text_info.txt', 'w').write('sample text '+os.environ.get('TEST_VAL', ''))"'''
actual_wheels = utils.cibuildwheel_run(project_dir, add_env={ actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
# write python version information to a temporary file, this is # write python version information to a temporary file, this is
# checked in setup.py # checked in setup.py
'CIBW_BEFORE_ALL': '''python -c "import os;open('{project}/text_info.txt', 'w').write('sample text '+os.environ.get('TEST_VAL', ''))"''', 'CIBW_BEFORE_ALL': before_all_command,
'CIBW_BEFORE_ALL_LINUX': before_all_command + ''' && python -c "import sys; assert sys.version_info >= (3, 6)"''',
'CIBW_ENVIRONMENT': "TEST_VAL='123'" 'CIBW_ENVIRONMENT': "TEST_VAL='123'"
}) })