Style tweaks
This commit is contained in:
@@ -45,7 +45,7 @@ class DockerContainer:
|
|||||||
],
|
],
|
||||||
check=True,
|
check=True,
|
||||||
)
|
)
|
||||||
process = subprocess.Popen(
|
self.process = subprocess.Popen(
|
||||||
[
|
[
|
||||||
'docker', 'start',
|
'docker', 'start',
|
||||||
'--attach', '--interactive',
|
'--attach', '--interactive',
|
||||||
@@ -58,10 +58,9 @@ class DockerContainer:
|
|||||||
# variables. We choose 256kB.
|
# variables. We choose 256kB.
|
||||||
bufsize=262144,
|
bufsize=262144,
|
||||||
)
|
)
|
||||||
self.process = process
|
assert self.process.stdin and self.process.stdout
|
||||||
assert process.stdin and process.stdout
|
self.bash_stdin = self.process.stdin
|
||||||
self.bash_stdin = process.stdin
|
self.bash_stdout = self.process.stdout
|
||||||
self.bash_stdout = process.stdout
|
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def __exit__(self, exc_type, exc_val, exc_tb):
|
def __exit__(self, exc_type, exc_val, exc_tb):
|
||||||
|
|||||||
+8
-11
@@ -135,7 +135,7 @@ def build(options: BuildOptions) -> None:
|
|||||||
|
|
||||||
# put this config's python top of the list
|
# put this config's python top of the list
|
||||||
python_bin = config.path / 'bin'
|
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)
|
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(['rm', '-rf', built_wheel_dir])
|
||||||
docker.call(['mkdir', '-p', built_wheel_dir])
|
docker.call(['mkdir', '-p', built_wheel_dir])
|
||||||
|
|
||||||
docker.call(
|
docker.call([
|
||||||
[
|
'pip', 'wheel',
|
||||||
'pip', 'wheel',
|
container_package_dir,
|
||||||
container_package_dir,
|
'-w', built_wheel_dir,
|
||||||
'-w', built_wheel_dir,
|
'--no-deps',
|
||||||
'--no-deps',
|
*get_build_verbosity_extra_flags(options.build_verbosity)
|
||||||
*get_build_verbosity_extra_flags(options.build_verbosity)
|
], env=env)
|
||||||
],
|
|
||||||
env=env,
|
|
||||||
)
|
|
||||||
|
|
||||||
built_wheel = docker.glob(built_wheel_dir / '*.whl')[0]
|
built_wheel = docker.glob(built_wheel_dir / '*.whl')[0]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user