From d552d29eae256dca594df79dc6b2d828cad2c6ab Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Sun, 21 Jun 2020 13:14:53 +0200 Subject: [PATCH] Revert use of Path.joinpath instead of Path.__div__ --- cibuildwheel/__main__.py | 2 +- cibuildwheel/macos.py | 6 +++--- setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 521710a6..137bc19e 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -166,7 +166,7 @@ def main() -> None: # This needs to be passed on to the docker container in linux.py os.environ['CIBUILDWHEEL'] = '1' - if not any(package_dir.joinpath(name).exists() + if not any((package_dir / name).exists() for name in ["setup.py", "setup.cfg", "pyproject.toml"]): print('cibuildwheel: Could not find setup.py, setup.cfg or pyproject.toml at root of package', file=sys.stderr) exit(2) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index bd78499d..2fd28d20 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -65,9 +65,9 @@ def make_symlinks(installation_bin_path: Path, python_executable: str, pip_execu shutil.rmtree(SYMLINKS_DIR) SYMLINKS_DIR.mkdir(parents=True) - SYMLINKS_DIR.joinpath('python').symlink_to(installation_bin_path / python_executable) - SYMLINKS_DIR.joinpath('python-config').symlink_to(installation_bin_path / (python_executable + '-config')) - SYMLINKS_DIR.joinpath('pip').symlink_to(installation_bin_path / pip_executable) + (SYMLINKS_DIR / 'python').symlink_to(installation_bin_path / python_executable) + (SYMLINKS_DIR / 'python-config').symlink_to(installation_bin_path / (python_executable + '-config')) + (SYMLINKS_DIR / 'pip').symlink_to(installation_bin_path / pip_executable) def install_cpython(version: str, url: str) -> Path: diff --git a/setup.py b/setup.py index d05407e5..34528b4d 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ except ImportError: from distutils.core import setup this_directory = Path(__file__).parent -long_description = this_directory.joinpath('README.md').read_text(encoding='utf-8') +long_description = (this_directory / 'README.md').read_text(encoding='utf-8') setup( name='cibuildwheel',