diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index 73529fff..3855c733 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -45,7 +45,7 @@ class DockerContainer: ], check=True, ) - process = subprocess.Popen( + self.process = subprocess.Popen( [ 'docker', 'start', '--attach', '--interactive', @@ -58,10 +58,9 @@ class DockerContainer: # variables. We choose 256kB. bufsize=262144, ) - self.process = process - assert process.stdin and process.stdout - self.bash_stdin = process.stdin - self.bash_stdout = process.stdout + assert self.process.stdin and self.process.stdout + self.bash_stdin = self.process.stdin + self.bash_stdout = self.process.stdout return self def __exit__(self, exc_type, exc_val, exc_tb): diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 30481008..60de4743 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -135,7 +135,7 @@ def build(options: BuildOptions) -> None: # put this config's python top of the list python_bin = config.path / 'bin' - env['PATH'] = f'{str(python_bin)}:{env["PATH"]}' + env['PATH'] = f'{python_bin}:{env["PATH"]}' env = options.environment.as_dictionary(env, executor=docker.environment_executor) @@ -159,16 +159,13 @@ def build(options: BuildOptions) -> None: docker.call(['rm', '-rf', built_wheel_dir]) docker.call(['mkdir', '-p', built_wheel_dir]) - docker.call( - [ - 'pip', 'wheel', - container_package_dir, - '-w', built_wheel_dir, - '--no-deps', - *get_build_verbosity_extra_flags(options.build_verbosity) - ], - env=env, - ) + docker.call([ + 'pip', 'wheel', + container_package_dir, + '-w', built_wheel_dir, + '--no-deps', + *get_build_verbosity_extra_flags(options.build_verbosity) + ], env=env) built_wheel = docker.glob(built_wheel_dir / '*.whl')[0]