From d2824b45e3311b6b9052135db18b30a0a1d43216 Mon Sep 17 00:00:00 2001 From: Noritada Kobayashi Date: Mon, 19 Oct 2020 23:31:20 +0900 Subject: [PATCH 1/3] Add support for stdio in Python code executed by python command --- src/commands.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/commands.rs b/src/commands.rs index ce5b88b..8ed88c0 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -3,7 +3,7 @@ use regex::Regex; use std::{error::Error, fmt}; use std::{ path::{Path, PathBuf}, - process::Command, + process::{Command, Stdio}, }; #[derive(Debug)] @@ -110,8 +110,12 @@ pub fn run_python( args: &[String], ) -> Result<(), Box> { util::set_pythonpath(lib_paths); - let output = Command::new(bin_path.join("python")).args(args).output()?; - util::check_command_output(&output, "running python"); + Command::new(bin_path.join("python")) + .args(args) + .stdin(Stdio::inherit()) + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .output()?; Ok(()) } From 57230eb99c38b39daaf97ef06b57b08bb968f9c2 Mon Sep 17 00:00:00 2001 From: Tice Cosmos Date: Fri, 30 Oct 2020 15:07:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?mv=20"manylinux2014=5Fi686"=20to=20Os::=1B[?= =?UTF-8?q?200~Linux32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util.rs b/src/util.rs index 051c41c..747386e 100644 --- a/src/util.rs +++ b/src/util.rs @@ -59,13 +59,12 @@ impl FromStr for Os { fn from_str(s: &str) -> Result { Ok(match s { - "manylinux1_i686" | "manylinux2010_i686" => Self::Linux32, + "manylinux1_i686" | "manylinux2010_i686" | "manylinux2014_i686" => Self::Linux32, "cygwin" | "linux" | "linux2" | "manylinux1_x86_64" | "manylinux2010_x86_64" - | "manylinux2014_i686" | "manylinux2014_aarch64" | "manylinux2014_x86_64" => Self::Linux, "win32" => Self::Windows32, From 93117dd06c859d576e3f24e89da3bfd24450aa6a Mon Sep 17 00:00:00 2001 From: ElijahSink <42477963+ElijahSink@users.noreply.github.com> Date: Thu, 29 Oct 2020 15:05:15 -0500 Subject: [PATCH 3/3] Clean up graph creation abort message #79. --- src/dep_resolution.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/dep_resolution.rs b/src/dep_resolution.rs index 53f8324..f5a5515 100644 --- a/src/dep_resolution.rs +++ b/src/dep_resolution.rs @@ -352,9 +352,12 @@ fn guess_graph( d } else { util::abort(&format!( - "Problem getting dependency data - this is \ - likely a bug in the cacheing process. Please try again in a few minutes. \ - Reqs: {:#?}", + "Aborting graph creation: Problem getting dependency data\n \ + Reqs: {:#?} + It's taking a long time to get dependency data - this \ + usually suggests that the dependency tree is being newly \ + built. Please try again in a few minutes, and if the error \ + still occurs, consider opening an issue on github.", &reqs )); unreachable!()