make regexes more robust (hopefully fix Windows?)

Author: AlexWaygood

crates/uv/tests/it/common/mod.rs

@@ -22,7 +22,7 @@ use regex::Regex;
 
 use tokio::io::AsyncWriteExt;
 use uv_cache::Cache;
-use uv_fs::Simplified;
+use uv_fs::{PythonExt, Simplified};
 use uv_python::managed::ManagedPythonInstallations;
 use uv_python::{
     EnvironmentPreference, PythonInstallation, PythonPreference, PythonRequest, PythonVersion,
@@ -243,23 +243,27 @@ impl TestContext {
         self
     }
 
-    /// Filtering for the `home = foo/bar/baz/python3.X.X/bin` key in a `pyvenv.cfg` file
+    /// Filtering for various keys in a `pyvenv.cfg` file that will vary
+    /// depending on the specific machine used:
+    /// - `home = foo/bar/baz/python3.X.X/bin`
+    /// - `uv = X.Y.Z`
+    /// - `extends-environment = <path/to/parent/venv>`
     #[must_use]
-    pub fn with_filtered_python_home_key(mut self) -> Self {
-        self.filters.push((
-            r"\nhome = .+\n".to_string(),
-            "\nhome = [PYTHON_HOME]\n".to_string(),
-        ));
-        self
-    }
-
-    /// Filtering for the `uv = X.Y.Z` key in a `pyvenv.cfg` file
-    #[must_use]
-    pub fn with_filtered_uv_version(mut self) -> Self {
-        self.filters.push((
-            r"\nuv = \d.\d.\d\n".to_string(),
-            "\nuv = [UV_VERSION]\n".to_string(),
-        ));
+    pub fn with_pyvenv_cfg_filters(mut self) -> Self {
+        let added_filters = [
+            (r"home = .+".to_string(), "home = [PYTHON_HOME]".to_string()),
+            (
+                r"uv = \d+\.\d+\.\d+".to_string(),
+                "uv = [UV_VERSION]".to_string(),
+            ),
+            (
+                r"extends-environment = .+".to_string(),
+                "extends-environment = [PARENT_VENV]".to_string(),
+            ),
+        ];
+        for filter in added_filters {
+            self.filters.insert(0, filter);
+        }
         self
     }
 

crates/uv/tests/it/run.rs

@@ -1269,17 +1269,14 @@ fn run_with() -> Result<()> {
 /// search paths are available in these ephemeral environments.
 #[test]
 fn run_with_pyvenv_cfg_file() -> Result<()> {
-    let context = TestContext::new("3.12")
-        .with_filtered_python_home_key()
-        .with_filtered_uv_version();
+    let context = TestContext::new("3.12").with_pyvenv_cfg_filters();
 
     let pyproject_toml = context.temp_dir.child("pyproject.toml");
     pyproject_toml.write_str(indoc! { r#"
         [project]
         name = "foo"
         version = "1.0.0"
         requires-python = ">=3.8"
-        dependencies = ["sniffio==1.3.0"]
 
         [build-system]
         requires = ["setuptools>=42"]
@@ -1306,15 +1303,14 @@ fn run_with_pyvenv_cfg_file() -> Result<()> {
     version_info = 3.12.[X]
     include-system-site-packages = false
     relocatable = true
-    extends-environment = [VENV]/
+    extends-environment = [PARENT_VENV]
 
 
     ----- stderr -----
-    Resolved 2 packages in [TIME]
-    Prepared 2 packages in [TIME]
-    Installed 2 packages in [TIME]
+    Resolved 1 package in [TIME]
+    Prepared 1 package in [TIME]
+    Installed 1 package in [TIME]
      + foo==1.0.0 (from file://[TEMP_DIR]/)
-     + sniffio==1.3.0
     Resolved 1 package in [TIME]
     Prepared 1 package in [TIME]
     Installed 1 package in [TIME]