extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-11-23 08:43:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(python): Handle PyPy python version correctly (#2374)

Browse Source 
* fix(python): Handle PyPy python version correctly

* refactor: rework Python version retrieval and formatting

Align Python version retrieval and formatting with established
Starship conventions.
This commit is contained in:
Asger Hautop Drewsen 2021-03-14 19:27:19 +01:00 committed by GitHub
parent 50bc5d9134
commit d2946ddff7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/modules/python.rs
View File

@ -69,29 +69,30 @@ fn get_python_version(context: &Context, config: &PythonConfig) -> Option<String
if config.pyenv_version_name {
return Some(context.exec_cmd("pyenv", &["version-name"])?.stdout);
};
let version = config.python_binary.0.iter().find_map(|binary| {
match context.exec_cmd(binary, &["--version"]) {
Some(output) => {
if output.stdout.is_empty() {
Some(output.stderr)
} else {
Some(output.stdout)
}
let version = config
.python_binary
.0
.iter()
.find_map(|binary| context.exec_cmd(binary, &["--version"]))
.map(|output| {
if output.stdout.is_empty() {
output.stderr
} else {
output.stdout
}
None => None,
}
})?;
Some(format_python_version(&version))
})?;
format_python_version(&version)
}
fn format_python_version(python_stdout: &str) -> String {
format!(
"v{}",
python_stdout
.trim_start_matches("Python ")
.trim_end_matches(":: Anaconda, Inc.")
.trim()
)
fn format_python_version(python_version: &str) -> Option<String> {
let version = python_version
// split into ["Python", "3.8.6", ...]
.split_whitespace()
// return "3.8.6"
.nth(1)?;
Some(format!("v{}", version))
}
fn get_python_virtual_env(context: &Context) -> Option<String> {
@ -123,13 +124,19 @@ mod tests {
#[test]
fn test_format_python_version() {
let input = "Python 3.7.2";
assert_eq!(format_python_version(input), "v3.7.2");
assert_eq!(format_python_version(input), Some("v3.7.2".to_string()));
}
#[test]
fn test_format_python_version_anaconda() {
let input = "Python 3.6.10 :: Anaconda, Inc.";
assert_eq!(format_python_version(input), "v3.6.10");
assert_eq!(format_python_version(input), Some("v3.6.10".to_string()));
}
#[test]
fn test_format_python_version_pypy() {
let input = "Python 3.7.9 (7e6e2bb30ac5fbdbd443619cae28c51d5c162a02, Nov 24 2020, 10:03:59)\n[PyPy 7.3.3-beta0 with GCC 10.2.0]";
assert_eq!(format_python_version(input), Some("v3.7.9".to_string()));
}
#[test]