Merge branch 'master' of https://github.com/David-OConnor/pyflow

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<dyn Error>> {
     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(())
 }
 

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!()

src/util.rs

@@ -59,13 +59,12 @@ impl FromStr for Os {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         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,