From 72f6b2761c571bd1ba85ef5043a2cee7cf212d8a Mon Sep 17 00:00:00 2001 From: Jan De Dobbeleer Date: Mon, 9 Nov 2020 15:47:34 +0100 Subject: [PATCH] fix: use regex for Python version relates to #133 --- segment_python.go | 6 ++++-- segment_python_test.go | 48 +++++++++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/segment_python.go b/segment_python.go index ba87d256..371e7175 100644 --- a/segment_python.go +++ b/segment_python.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "regexp" "strings" ) @@ -40,8 +41,9 @@ func (p *python) enabled() bool { for index, python := range pythonVersions { version, _ := p.env.runCommand(python, "--version") if version != "" { - rawVersion := strings.TrimLeft(version, "Python") - p.pythonVersion = strings.Trim(rawVersion, " ") + re := regexp.MustCompile(`Python (?P[0-9]+.[0-9]+.[0-9]+)`) + values := groupDict(re, version) + p.pythonVersion = strings.Trim(values["version"], " ") break } //last element, Python isn't installed on this machine diff --git a/segment_python_test.go b/segment_python_test.go index e5de9b71..8301e124 100755 --- a/segment_python_test.go +++ b/segment_python_test.go @@ -54,7 +54,7 @@ func TestPythonWriterDisabledNoPythonFiles(t *testing.T) { args := newPythonArgs() args.hasPyFiles = false args.hasNotebookFiles = false - args.python3Version = "3.4.5" + args.python3Version = "Python 3.4.5" python := bootStrapPythonTest(args) assert.False(t, python.enabled(), "there are no Python files in the current folder") } @@ -63,7 +63,7 @@ func TestPythonWriterDisabledHasPythonFiles(t *testing.T) { args := newPythonArgs() args.hasPyFiles = true args.hasNotebookFiles = false - args.python3Version = "3.4.5" + args.python3Version = "Python 3.4.5" python := bootStrapPythonTest(args) assert.True(t, python.enabled(), "there should be a Python file in the current folder") } @@ -72,7 +72,7 @@ func TestPythonWriterDisabledHasJupyterNotebookFiles(t *testing.T) { args := newPythonArgs() args.hasPyFiles = false args.hasNotebookFiles = true - args.python3Version = "3.4.5" + args.python3Version = "Python 3.4.5" python := bootStrapPythonTest(args) assert.True(t, python.enabled(), "there should be a Jupyter Notebook file in the current folder") } @@ -81,7 +81,7 @@ func TestPythonWriterDisabledHasPyAndJupyterNotebookFiles(t *testing.T) { args := newPythonArgs() args.hasPyFiles = true args.hasNotebookFiles = true - args.python3Version = "3.4.5" + args.python3Version = "Python 3.4.5" python := bootStrapPythonTest(args) assert.True(t, python.enabled(), "there should be a Jupyter Notebook file in the current folder") } @@ -102,15 +102,15 @@ func TestPythonWriterDisabledNoPythonInstalled(t *testing.T) { func TestPythonWriterEnabledNoVirtualEnv(t *testing.T) { args := newPythonArgs() - args.python3Version = "3.4.5" + args.python3Version = "Python 3.4.5" python := bootStrapPythonTest(args) assert.True(t, python.enabled()) - assert.Equal(t, args.python3Version, python.string()) + assert.Equal(t, "3.4.5", python.string()) } func TestPythonWriterEnabledVirtualEnvOverrule(t *testing.T) { args := newPythonArgs() - args.python3Version = "3.4.5" + args.python3Version = "Python 3.4.5" args.condaEnvName = "myenv" props := &properties{ values: map[Property]interface{}{ @@ -120,14 +120,14 @@ func TestPythonWriterEnabledVirtualEnvOverrule(t *testing.T) { python := bootStrapPythonTest(args) python.props = props assert.True(t, python.enabled()) - assert.Equal(t, args.python3Version, python.string()) + assert.Equal(t, "3.4.5", python.string()) } func TestPythonWriterEnabledVirtualEnv(t *testing.T) { args := newPythonArgs() - args.python3Version = "3.4.5" + args.python3Version = "Python 3.4.5" args.condaEnvName = "myenv" - expected := fmt.Sprintf("%s %s", args.condaEnvName, args.python3Version) + expected := fmt.Sprintf("%s %s", args.condaEnvName, "3.4.5") props := &properties{ values: map[Property]interface{}{ DisplayVirtualEnv: true, @@ -142,8 +142,8 @@ func TestPythonWriterEnabledVirtualEnv(t *testing.T) { func TestPythonWriterEnabledWithVirtualEnv(t *testing.T) { args := newPythonArgs() args.virtualEnvName = "venv" - args.python3Version = "3.4.5" - expected := fmt.Sprintf("%s %s", args.virtualEnvName, args.python3Version) + args.python3Version = "Python 3.4.5" + expected := fmt.Sprintf("%s %s", args.virtualEnvName, "3.4.5") python := bootStrapPythonTest(args) assert.True(t, python.enabled()) assert.Equal(t, expected, python.string()) @@ -152,8 +152,8 @@ func TestPythonWriterEnabledWithVirtualEnv(t *testing.T) { func TestPythonWriterEnabledWithCondaEnvPath(t *testing.T) { args := newPythonArgs() args.condaEnvName = "conda" - args.python3Version = "3.4.5" - expected := fmt.Sprintf("%s %s", args.condaEnvName, args.python3Version) + args.python3Version = "Python 3.4.5 something off about this one" + expected := fmt.Sprintf("%s %s", args.condaEnvName, "3.4.5") python := bootStrapPythonTest(args) assert.True(t, python.enabled()) assert.Equal(t, expected, python.string()) @@ -162,8 +162,18 @@ func TestPythonWriterEnabledWithCondaEnvPath(t *testing.T) { func TestPythonWriterEnabledWithCondaDefaultEnv(t *testing.T) { args := newPythonArgs() args.condaDefaultName = "conda2" - args.python3Version = "3.4.5" - expected := fmt.Sprintf("%s %s", args.condaDefaultName, args.python3Version) + args.python3Version = "Python 3.4.5" + expected := fmt.Sprintf("%s %s", args.condaDefaultName, "3.4.5") + python := bootStrapPythonTest(args) + assert.True(t, python.enabled()) + assert.Equal(t, expected, python.string()) +} + +func TestPythonWriterEnabledWithCondaDefaultEnvAnacondaInc(t *testing.T) { + args := newPythonArgs() + args.condaDefaultName = "flatland_rl" + args.pythonVersion = "Python 3.6.8 :: Anaconda, Inc." + expected := "flatland_rl 3.6.8" python := bootStrapPythonTest(args) assert.True(t, python.enabled()) assert.Equal(t, expected, python.string()) @@ -173,8 +183,8 @@ func TestPythonWriterEnabledWithTwoValidEnvs(t *testing.T) { args := newPythonArgs() args.condaEnvName = "conda" args.condaDefaultName = "conda2" - args.python3Version = "3.4.5" - expected := fmt.Sprintf("%s %s", args.condaEnvName, args.python3Version) + args.python3Version = "Python 3.4.5" + expected := fmt.Sprintf("%s %s", args.condaEnvName, "3.4.5") python := bootStrapPythonTest(args) assert.True(t, python.enabled()) assert.Equal(t, expected, python.string()) @@ -183,7 +193,7 @@ func TestPythonWriterEnabledWithTwoValidEnvs(t *testing.T) { func TestPythonWriterNameTrailingSlash(t *testing.T) { args := newPythonArgs() args.virtualEnvName = "python/" - args.pythonVersion = "2.7.3" + args.pythonVersion = "Python 2.7.3" python := bootStrapPythonTest(args) assert.True(t, python.enabled()) assert.Equal(t, "python", python.venvName)