Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add filtering of the test context Python interpreter (#4364) 

Does not handle tests with multiple Python versions yet, working on that
separately because the change is more invasive
This commit is contained in:
Zanie Blue 2024-06-17 14:11:12 -04:00 committed by GitHub
parent b5d280dc40
commit 94fe70d547
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/uv/tests/common/mod.rs
View File

@ -70,7 +70,8 @@ impl TestContext {
pub fn new(python_version: &str) -> Self { pub fn new(python_version: &str) -> Self {
let temp_dir = assert_fs::TempDir::new().expect("Failed to create temp dir"); let temp_dir = assert_fs::TempDir::new().expect("Failed to create temp dir");
let cache_dir = assert_fs::TempDir::new().expect("Failed to create cache dir"); let cache_dir = assert_fs::TempDir::new().expect("Failed to create cache dir");
let venv = create_venv(&temp_dir, &cache_dir, python_version); let python = get_toolchain(python_version);
let venv = create_venv_from_executable(&temp_dir, &cache_dir, &python);
// The workspace root directory is not available without walking up the tree // The workspace root directory is not available without walking up the tree
// https://github.com/rust-lang/cargo/issues/3946 // https://github.com/rust-lang/cargo/issues/3946
@ -87,6 +88,11 @@ impl TestContext {
PythonVersion::from_str(python_version).expect("Tests must use valid Python versions"); PythonVersion::from_str(python_version).expect("Tests must use valid Python versions");
let mut filters = Vec::new(); let mut filters = Vec::new();
filters.extend(
Self::path_patterns(python)
.into_iter()
.map(|pattern| (format!("{pattern}python.*"), "[PYTHON]".to_string())),
);
filters.extend( filters.extend(
Self::path_patterns(&cache_dir) Self::path_patterns(&cache_dir)
.into_iter() .into_iter()
@ -534,14 +540,25 @@ pub fn get_toolchain(python: &str) -> PathBuf {
} }
/// Create a virtual environment named `.venv` in a temporary directory with the given /// Create a virtual environment named `.venv` in a temporary directory with the given
/// Python version. Expected format for `python` is "<version>". /// Python version.
pub fn create_venv<Parent: assert_fs::prelude::PathChild + AsRef<std::path::Path>>( pub fn create_venv<Parent: assert_fs::prelude::PathChild + AsRef<std::path::Path>>(
temp_dir: &Parent, temp_dir: &Parent,
cache_dir: &assert_fs::TempDir, cache_dir: &assert_fs::TempDir,
python: &str, python: &str,
) -> PathBuf { ) -> PathBuf {
let python = get_toolchain(python); let python = get_toolchain(python);
create_venv_from_executable(temp_dir, cache_dir, &python)
}
/// Create a virtual environment named `.venv` in a temporary directory with the given
/// Python executable.
pub fn create_venv_from_executable<
Parent: assert_fs::prelude::PathChild + AsRef<std::path::Path>,
>(
temp_dir: &Parent,
cache_dir: &assert_fs::TempDir,
python: &Path,
) -> PathBuf {
let venv = temp_dir.child(".venv"); let venv = temp_dir.child(".venv");
Command::new(get_bin()) Command::new(get_bin())
.arg("venv") .arg("venv")