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

Merge pull request #369 from Czaki/ensure_dir_name

Browse Source 
Ensure dir name
This commit is contained in:
Joe Rickerby
2020-06-16 15:07:58 +01:00
committed by GitHub
parent df07aafae1 374e88382b
commit 02e9ee3e96
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/macos.py
+3 -1
View File
@@ -194,7 +194,9 @@ def build(options: BuildOptions) -> None:
if os.path.exists(built_wheel_dir): if os.path.exists(built_wheel_dir):
shutil.rmtree(built_wheel_dir) shutil.rmtree(built_wheel_dir)
os.makedirs(built_wheel_dir) os.makedirs(built_wheel_dir)
call(['pip', 'wheel', options.package_dir, '-w', built_wheel_dir, '--no-deps'] + get_build_verbosity_extra_flags(options.build_verbosity), env=env) # os.path.abspath is need. Without it pip wheel may try to fetch package from pypi.org
# see https://github.com/joerick/cibuildwheel/pull/369
call(['pip', 'wheel', os.path.abspath(options.package_dir), '-w', built_wheel_dir, '--no-deps'] + get_build_verbosity_extra_flags(options.build_verbosity), env=env)
built_wheel = glob(os.path.join(built_wheel_dir, '*.whl'))[0] built_wheel = glob(os.path.join(built_wheel_dir, '*.whl'))[0]
# repair the wheel # repair the wheel
cibuildwheel/windows.py
+3 -1
View File
@@ -180,7 +180,9 @@ def build(options: BuildOptions) -> None:
if os.path.exists(built_wheel_dir): if os.path.exists(built_wheel_dir):
shutil.rmtree(built_wheel_dir) shutil.rmtree(built_wheel_dir)
os.makedirs(built_wheel_dir) os.makedirs(built_wheel_dir)
shell(['pip', 'wheel', options.package_dir, '-w', built_wheel_dir, '--no-deps'] + get_build_verbosity_extra_flags(options.build_verbosity), env=env) # os.path.abspath is need. Without it pip wheel may try to fetch package from pypi.org
# see https://github.com/joerick/cibuildwheel/pull/369
shell(['pip', 'wheel', os.path.abspath(options.package_dir), '-w', built_wheel_dir, '--no-deps'] + get_build_verbosity_extra_flags(options.build_verbosity), env=env)
built_wheel = glob(os.path.join(built_wheel_dir, '*.whl'))[0] built_wheel = glob(os.path.join(built_wheel_dir, '*.whl'))[0]
# repair the wheel # repair the wheel
test/test_subdir_package.py
+1 -1
View File
@@ -35,7 +35,7 @@ def test(capfd, tmp_path):
project_dir = tmp_path / 'project' project_dir = tmp_path / 'project'
subdir_package_project.generate(project_dir) subdir_package_project.generate(project_dir)
package_dir = os.path.join(project_dir, 'src', 'spam') package_dir = os.path.join('src', 'spam')
# build the wheels # build the wheels
actual_wheels = utils.cibuildwheel_run(project_dir, package_dir=package_dir, add_env={ actual_wheels = utils.cibuildwheel_run(project_dir, package_dir=package_dir, add_env={
'CIBW_BEFORE_BUILD': 'python {project}/bin/before_build.py', 'CIBW_BEFORE_BUILD': 'python {project}/bin/before_build.py',