From 0b82ab66746458fd70956f54481c47d975ec08cc Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Sat, 6 Jun 2020 20:05:09 +0200 Subject: [PATCH] ensure that package_dir is provided as package --- cibuildwheel/__main__.py | 2 ++ test/test_subdir_package.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 95bc96b9..583abaa8 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -119,6 +119,8 @@ def main() -> None: 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='') package_dir = args.package_dir + if not package_dir.startswith("."): + package_dir = os.path.join(".", package_dir) 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_config, skip_config = os.environ.get('CIBW_BUILD', '*'), os.environ.get('CIBW_SKIP', '') diff --git a/test/test_subdir_package.py b/test/test_subdir_package.py index 53bd9520..98b1b8cd 100644 --- a/test/test_subdir_package.py +++ b/test/test_subdir_package.py @@ -35,7 +35,7 @@ def test(capfd, tmp_path): project_dir = tmp_path / 'project' 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 actual_wheels = utils.cibuildwheel_run(project_dir, package_dir=package_dir, add_env={ 'CIBW_BEFORE_BUILD': 'python {project}/bin/before_build.py',