Scrap the stderr->stdout redirect (we don't seem to need it)

Let's keep an eye on this and if we see output outside of the fold
groups we can add it back
This commit is contained in:
Joe Rickerby
2020-11-24 19:04:27 +00:00
parent 27bda4fa64
commit c065e3ce2d
3 changed files with 3 additions and 6 deletions
-1
View File
@@ -220,7 +220,6 @@ def main() -> None:
# Python is buffering by default when running on the CI platforms, giving problems interleaving subprocess call output with unflushed calls to 'print'
sys.stdout = Unbuffered(sys.stdout) # type: ignore
# sys.stderr = Unbuffered(sys.stderr) # type: ignore
print_preamble(platform, build_options)
+1 -2
View File
@@ -22,8 +22,7 @@ def call(args: Union[str, Sequence[Union[str, PathLike]]], env: Optional[Dict[st
else:
print('+ ' + ' '.join(shlex.quote(str(a)) for a in args))
# run the process. Subprocess stderr is routed to stdout to keep output interleaved
return subprocess.check_call(args, env=env, cwd=cwd, shell=shell, stderr=subprocess.STDOUT)
return subprocess.check_call(args, env=env, cwd=cwd, shell=shell)
class PythonConfiguration(NamedTuple):
+2 -3
View File
@@ -25,13 +25,12 @@ def call(args: Sequence[Union[str, PathLike]], env: Optional[Dict[str, str]] = N
print('+ ' + ' '.join(str(a) for a in args))
# we use shell=True here, even though we don't need a shell due to a bug
# https://bugs.python.org/issue8557
subprocess.check_call([str(a) for a in args], env=env, cwd=cwd, shell=True, stderr=subprocess.STDOUT)
subprocess.check_call([str(a) for a in args], env=env, cwd=cwd, shell=True)
def shell(command: str, env: Optional[Dict[str, str]] = None, cwd: Optional[str] = None) -> None:
print(f'+ {command}')
# route stderr to stdout so output remains interleaved
subprocess.check_call(command, env=env, cwd=cwd, shell=True, stderr=subprocess.STDOUT)
subprocess.check_call(command, env=env, cwd=cwd, shell=True)
def get_nuget_args(version: str, arch: str) -> List[str]: