From ae6d65e62e9831411accddd6437ac847924265f7 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Wed, 22 Jul 2020 15:27:51 +0200 Subject: [PATCH] use variable instead on '/project' literal --- cibuildwheel/linux.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 344b944a..7d17b046 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -101,7 +101,8 @@ def build(options: BuildOptions) -> None: if cwd != abs_package_dir and cwd not in abs_package_dir.parents: raise Exception('package_dir must be inside the working directory') - container_package_dir = PurePath('/project') / abs_package_dir.relative_to(cwd) + project_path = '/project' + container_package_dir = PurePath(project_path) / abs_package_dir.relative_to(cwd) container_output_dir = PurePath('/output') for implementation, platform_tag, docker_image in platforms: @@ -110,15 +111,15 @@ def build(options: BuildOptions) -> None: continue try: - with DockerContainer(docker_image, simulate_32_bit=platform_tag.endswith('i686'), cwd='/project') as docker: - docker.copy_into(Path.cwd(), PurePath('/project')) + with DockerContainer(docker_image, simulate_32_bit=platform_tag.endswith('i686'), cwd=project_path) as docker: + docker.copy_into(Path.cwd(), PurePath(project_path)) if options.before_all: env = docker.get_environment() env['PATH'] = f'/opt/python/cp38-cp38:{env["PATH"]}' env = options.environment.as_dictionary(env, executor=docker.environment_executor) - before_all_prepared = prepare_command(options.before_all, project='/project', package=container_package_dir) + before_all_prepared = prepare_command(options.before_all, project=project_path, package=container_package_dir) docker.call(['sh', '-c', before_all_prepared], env=env) for config in platform_configs: @@ -151,7 +152,7 @@ def build(options: BuildOptions) -> None: exit(1) if options.before_build: - before_build_prepared = prepare_command(options.before_build, project='/project', package=container_package_dir) + before_build_prepared = prepare_command(options.before_build, project=project_path, package=container_package_dir) docker.call(['sh', '-c', before_build_prepared], env=env) temp_dir = PurePath('/tmp/cibuildwheel') @@ -193,7 +194,7 @@ def build(options: BuildOptions) -> None: virtualenv_env['PATH'] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}" if options.before_test: - before_test_prepared = prepare_command(options.before_test, project='/project', package=container_package_dir) + before_test_prepared = prepare_command(options.before_test, project=project_path, package=container_package_dir) docker.call(['sh', '-c', before_test_prepared], env=virtualenv_env) # Install the wheel we just built @@ -210,7 +211,7 @@ def build(options: BuildOptions) -> None: docker.call(['pip', 'install', *options.test_requires], env=virtualenv_env) # Run the tests from a different directory - test_command_prepared = prepare_command(options.test_command, project='/project', package=container_package_dir) + test_command_prepared = prepare_command(options.test_command, project=project_path, package=container_package_dir) docker.call(['sh', '-c', test_command_prepared], cwd='/root', env=virtualenv_env) # clean up test environment