mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-31 13:57:26 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(python): do not clear virtualenv in pyenv

Browse source 
resolves #2582
This commit is contained in:
Jan De Dobbeleer 2022-07-28 07:48:52 +02:00 committed by Jan De Dobbeleer
parent 1899896c6d
commit c22d0d67be
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/segments/python.go
View file

@ -135,8 +135,7 @@ func (p *Python) pyenvVersion() (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
// Unset whatever loadContext thinks Venv should be // override virtualenv if pyenv set one
p.Venv = ""
parts := strings.Split(shortPath, string(filepath.Separator)) parts := strings.Split(shortPath, string(filepath.Separator))
if len(parts) > 2 && p.canUseVenvName(parts[2]) { if len(parts) > 2 && p.canUseVenvName(parts[2]) {
p.Venv = parts[2] p.Venv = parts[2]

4
src/segments/python_test.go
View file

@ -70,9 +70,9 @@ func TestPythonTemplate(t *testing.T) {
Case: "Pyenv virtual env version name", Case: "Pyenv virtual env version name",
FetchVersion: true, FetchVersion: true,
VirtualEnvName: "demo", VirtualEnvName: "demo",
Expected: "3.8.4", Expected: "demo 3.8.4",
PythonPath: "/home/user/.pyenv/shims/python", PythonPath: "/home/user/.pyenv/shims/python",
Template: "{{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}", Template: "{{ .Venv }} {{ .Full }}",
ResolveSymlink: ResolveSymlink{Path: "/home/user/.pyenv/versions/demo", Err: nil}, ResolveSymlink: ResolveSymlink{Path: "/home/user/.pyenv/versions/demo", Err: nil},
}, },
} }