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

move abspath to system specific files

Browse Source
This commit is contained in:
Grzegorz Bokota
2020-06-08 10:19:02 +02:00
parent c74acd6363
commit 374e88382b
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/__main__.py
+1 -1
View File
@@ -118,7 +118,7 @@ def main() -> None:
test_command = get_option_from_environment('CIBW_TEST_COMMAND', platform=platform) test_command = get_option_from_environment('CIBW_TEST_COMMAND', platform=platform)
test_requires = get_option_from_environment('CIBW_TEST_REQUIRES', platform=platform, default='').split() test_requires = get_option_from_environment('CIBW_TEST_REQUIRES', platform=platform, default='').split()
test_extras = get_option_from_environment('CIBW_TEST_EXTRAS', platform=platform, default='') test_extras = get_option_from_environment('CIBW_TEST_EXTRAS', platform=platform, default='')
package_dir = os.path.abspath(args.package_dir) package_dir = args.package_dir
before_build = get_option_from_environment('CIBW_BEFORE_BUILD', platform=platform) before_build = get_option_from_environment('CIBW_BEFORE_BUILD', platform=platform)
build_verbosity_str = get_option_from_environment('CIBW_BUILD_VERBOSITY', platform=platform, default='') build_verbosity_str = get_option_from_environment('CIBW_BUILD_VERBOSITY', platform=platform, default='')
build_config, skip_config = os.environ.get('CIBW_BUILD', '*'), os.environ.get('CIBW_SKIP', '') build_config, skip_config = os.environ.get('CIBW_BUILD', '*'), os.environ.get('CIBW_SKIP', '')
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
unit_test/main_tests/conftest.py
+1 -1
View File
@@ -18,7 +18,7 @@ class ArgsInterceptor:
self.kwargs = kwargs self.kwargs = kwargs
MOCK_PACKAGE_DIR = os.path.abspath('some_package_dir') MOCK_PACKAGE_DIR = 'some_package_dir'
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)