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

Revert use of Path.joinpath instead of Path.__div__

Browse Source
This commit is contained in:
Yannick Jadoul
2020-06-21 13:14:53 +02:00
parent acf5c24881
commit d552d29eae
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/__main__.py
+1 -1
View File
@@ -166,7 +166,7 @@ def main() -> None:
# This needs to be passed on to the docker container in linux.py # This needs to be passed on to the docker container in linux.py
os.environ['CIBUILDWHEEL'] = '1' 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"]): 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) print('cibuildwheel: Could not find setup.py, setup.cfg or pyproject.toml at root of package', file=sys.stderr)
exit(2) exit(2)
cibuildwheel/macos.py
+3 -3
View File
@@ -65,9 +65,9 @@ def make_symlinks(installation_bin_path: Path, python_executable: str, pip_execu
shutil.rmtree(SYMLINKS_DIR) shutil.rmtree(SYMLINKS_DIR)
SYMLINKS_DIR.mkdir(parents=True) SYMLINKS_DIR.mkdir(parents=True)
SYMLINKS_DIR.joinpath('python').symlink_to(installation_bin_path / python_executable) (SYMLINKS_DIR / 'python').symlink_to(installation_bin_path / python_executable)
SYMLINKS_DIR.joinpath('python-config').symlink_to(installation_bin_path / (python_executable + '-config')) (SYMLINKS_DIR / 'python-config').symlink_to(installation_bin_path / (python_executable + '-config'))
SYMLINKS_DIR.joinpath('pip').symlink_to(installation_bin_path / pip_executable) (SYMLINKS_DIR / 'pip').symlink_to(installation_bin_path / pip_executable)
def install_cpython(version: str, url: str) -> Path: def install_cpython(version: str, url: str) -> Path:
setup.py
+1 -1
View File
@@ -7,7 +7,7 @@ except ImportError:
from distutils.core import setup from distutils.core import setup
this_directory = Path(__file__).parent 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( setup(
name='cibuildwheel', name='cibuildwheel',