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

Merge pull request #51 from YannickJadoul/single-subdir-project-fix

Browse Source 
Fixing confusion between subdirectory and PyPI projectin call to `pip wheel <subdir>`
This commit is contained in:
Joe Rickerby
2018-01-04 22:31:51 +00:00
committed by GitHub
parent a9e05a596a a85b535d83
commit e5c7bb416d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/macos.py
+3 -2
View File
@@ -33,6 +33,8 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
return subprocess.check_call(args, env=env, cwd=cwd, shell=shell) return subprocess.check_call(args, env=env, cwd=cwd, shell=shell)
abs_project_dir = os.path.abspath(project_dir)
for config in python_configurations: for config in python_configurations:
if skip(config.identifier): if skip(config.identifier):
print('cibuildwheel: Skipping build %s' % config.identifier, file=sys.stderr) print('cibuildwheel: Skipping build %s' % config.identifier, file=sys.stderr)
@@ -80,7 +82,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
call(before_build_prepared, env=env, shell=True) call(before_build_prepared, env=env, shell=True)
# build the wheel # build the wheel
call([pip, 'wheel', project_dir, '-w', '/tmp/built_wheel', '--no-deps'], env=env) call([pip, 'wheel', abs_project_dir, '-w', '/tmp/built_wheel', '--no-deps'], env=env)
built_wheel = glob('/tmp/built_wheel/*.whl')[0] built_wheel = glob('/tmp/built_wheel/*.whl')[0]
if built_wheel.endswith('none-any.whl'): if built_wheel.endswith('none-any.whl'):
@@ -103,7 +105,6 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
# run the tests from $HOME, with an absolute path in the command # run the tests from $HOME, with an absolute path in the command
# (this ensures that Python runs the tests against the installed wheel # (this ensures that Python runs the tests against the installed wheel
# and not the repo code) # and not the repo code)
abs_project_dir = os.path.abspath(project_dir)
test_command_absolute = test_command.format(project=abs_project_dir) test_command_absolute = test_command.format(project=abs_project_dir)
call(shlex.split(test_command_absolute), cwd=os.environ['HOME'], env=env) call(shlex.split(test_command_absolute), cwd=os.environ['HOME'], env=env)
cibuildwheel/windows.py
+2 -2
View File
@@ -42,6 +42,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
PythonConfiguration(version='3.6.x', arch="64", identifier='cp36-win_amd64', path='C:\Python36-x64'), PythonConfiguration(version='3.6.x', arch="64", identifier='cp36-win_amd64', path='C:\Python36-x64'),
] ]
abs_project_dir = os.path.abspath(project_dir)
temp_dir = tempfile.mkdtemp(prefix='cibuildwheel') temp_dir = tempfile.mkdtemp(prefix='cibuildwheel')
built_wheel_dir = os.path.join(temp_dir, 'built_wheel') built_wheel_dir = os.path.join(temp_dir, 'built_wheel')
@@ -81,7 +82,7 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
shell([before_build_prepared], env=env) shell([before_build_prepared], env=env)
# build the wheel # build the wheel
shell(['pip', 'wheel', project_dir, '-w', built_wheel_dir, '--no-deps'], env=env) shell(['pip', 'wheel', abs_project_dir, '-w', built_wheel_dir, '--no-deps'], env=env)
built_wheel = glob(built_wheel_dir+'/*.whl')[0] built_wheel = glob(built_wheel_dir+'/*.whl')[0]
# install the wheel # install the wheel
@@ -94,7 +95,6 @@ def build(project_dir, package_name, output_dir, test_command, test_requires, be
# run the tests from c:\, with an absolute path in the command # run the tests from c:\, with an absolute path in the command
# (this ensures that Python runs the tests against the installed wheel # (this ensures that Python runs the tests against the installed wheel
# and not the repo code) # and not the repo code)
abs_project_dir = os.path.abspath(project_dir)
test_command_absolute = test_command.format(project=abs_project_dir) test_command_absolute = test_command.format(project=abs_project_dir)
shell([test_command_absolute], cwd='c:\\', env=env) shell([test_command_absolute], cwd='c:\\', env=env)