Windows: Use virtualenv

Author: jayvdb

ci/azure-pipelines-template.yml

@@ -62,6 +62,7 @@ jobs:
   - ${{ if eq(parameters.name, 'Windows') }}:
     - script: |
         set RUST_BACKTRACE=1
+        set VIRTUALENV_VERBOSE=1
         cargo run --bin pyoxidizer -- init --pip-install cryptography --python-code 'print("hello, world")' %HOME%/pyapp
         cargo run --bin pyoxidizer -- --verbose run %HOME%/pyapp
       displayName: Build Oxidized Application (Windows)

pyoxidizer/src/app_packaging/packaging_rule.rs

@@ -431,7 +431,7 @@ fn resolve_virtualenv(
     let location = ResourceLocation::new(&rule.install_location);
 
     let python_paths =
-        resolve_python_paths(&Path::new(&rule.path), &dist.version, dist.os == "windows");
+        resolve_python_paths(&Path::new(&rule.path), &dist.version);
 
     process_resources(
         &logger,

pyoxidizer/src/py_packaging/distribution.rs

@@ -35,6 +35,12 @@ const PIP_EXE_BASENAME: &str = "pip3.exe";
 #[cfg(unix)]
 const PIP_EXE_BASENAME: &str = "pip3";
 
+#[cfg(windows)]
+const VENV_MODULE: &str = "virtualenv";
+
+#[cfg(unix)]
+const VENV_MODULE: &str = "venv";
+
 const STDLIB_TEST_PACKAGES: &[&str] = &[
     "bsddb.test",
     "ctypes.test",
@@ -354,35 +360,34 @@ pub struct PythonPaths {
 }
 
 /// Resolve the location of Python modules given a base install path.
-pub fn resolve_python_paths(base: &Path, python_version: &str, is_windows: bool) -> PythonPaths {
+pub fn resolve_python_paths(base: &Path, python_version: &str) -> PythonPaths {
     let prefix = base.to_path_buf().canonicalize().unwrap();
 
-    let mut p = prefix.clone();
+    let p = prefix.clone();
 
-    let bin_dir = if is_windows {
+    let bin_dir = if p.join("Scripts").exists() {
         p.join("Scripts")
     } else {
         p.join("bin")
     };
 
-    let python_exe = if is_windows {
-        p.join(PYTHON_EXE_BASENAME)
-    } else {
+    let python_exe = if bin_dir.join(PYTHON_EXE_BASENAME).exists() {
         bin_dir.join(PYTHON_EXE_BASENAME)
+    } else {
+        p.join(PYTHON_EXE_BASENAME)
     };
 
     let pyoxidizer_state_dir = p.join("state").join("pyoxidizer");
 
-    if is_windows {
-        p.push("Lib");
-    } else {
-        p.push("lib");
-        p.push(format!("python{}", &python_version[0..3]));
-    }
+    let unix_lib_dir = p.join("lib").join(format!("python{}", &python_version[0..3]));
 
-    let stdlib = p.clone().canonicalize().unwrap();
+    let stdlib = if unix_lib_dir.exists() {
+        unix_lib_dir
+    } else {
+        p.join("Lib")
+    }.canonicalize().unwrap();
 
-    let site_packages = p.join("site-packages");
+    let site_packages = stdlib.join("site-packages");
 
     PythonPaths {
         prefix,
@@ -471,7 +476,7 @@ impl ParsedPythonDistribution {
     /// Ensure pip is available to run in the distribution.
     pub fn ensure_pip(&self, logger: &slog::Logger) -> PathBuf {
         let dist_prefix = self.base_dir.join("python").join("install");
-        let python_paths = resolve_python_paths(&dist_prefix, &self.version, self.os == "windows");
+        let python_paths = resolve_python_paths(&dist_prefix, &self.version);
 
         let pip_path = python_paths.bin_dir.join(PIP_EXE_BASENAME);
 
@@ -480,6 +485,10 @@ impl ParsedPythonDistribution {
             invoke_python(&python_paths, &logger, &["-m", "ensurepip"]);
         }
 
+        if VENV_MODULE == "virtualenv" {
+            invoke_python(&python_paths, &logger, &["-m", "pip", "install", "virtualenv"]);
+        }
+
         pip_path
     }
 
@@ -501,10 +510,10 @@ impl ParsedPythonDistribution {
             copy_dir(&dist_prefix, &venv_base).unwrap();
 
             // Provide a reliable mtime
-            File::create(&venv_base.join(".timestamp")).unwrap(); //.sync_all();
+            File::create(&venv_base.join(".timestamp")).unwrap();
         }
 
-        let python_paths = resolve_python_paths(&venv_base, &self.version, self.os == "windows");
+        let python_paths = resolve_python_paths(&venv_base, &self.version);
 
         prepare_hacked_distutils(logger, &python_paths);
 
@@ -519,13 +528,13 @@ impl ParsedPythonDistribution {
         let python_paths = self.create_hacked_base(&logger);
 
         if path.exists() {
-            warn!(logger, "re-using venv {}", venv_dir_s);
+            warn!(logger, "re-using {} {}", VENV_MODULE, venv_dir_s);
         } else {
-            warn!(logger, "creating venv {}", venv_dir_s);
-            invoke_python(&python_paths, &logger, &["-m", "venv", venv_dir_s.as_str()]);
+            warn!(logger, "creating {} {}", VENV_MODULE, venv_dir_s);
+            invoke_python(&python_paths, &logger, &["-m", VENV_MODULE, venv_dir_s.as_str()]);
         }
 
-        resolve_python_paths(&path, &self.version, self.os == "windows")
+        resolve_python_paths(&path, &self.version)
     }
 
     /// Create or re-use an existing venv

pyoxidizer/src/py_packaging/distutils.rs

@@ -31,14 +31,14 @@ lazy_static! {
             "distutils/unixccompiler.py",
             include_bytes!("../cpython_lib_hacks/distutils/unixccompiler.py"),
         );
-        res.insert(
+        /*res.insert(
             "venv/__init__.py",
             include_bytes!("../cpython_lib_hacks/venv/__init__.py"),
         );
         res.insert(
             "venv/__main__.py",
             include_bytes!("../cpython_lib_hacks/venv/__main__.py"),
-        );
+        );*/
 
         res
     };