Merge branch 'v1.0.2'

Author: connesy

CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
+## [v1.0.2](https://github.com/SallingGroup-AI-and-ML/venv-cli/releases/tag/v1.0.2) (2023-08-02)
+
+* Fixed test that checks the version number follows the required pattern.
+
 ## [v1.0.1](https://github.com/SallingGroup-AI-and-ML/venv-cli/releases/tag/v1.0.1) (2023-08-02)
 
 * Added support for `zsh` shell.
-* Added `CHANGELOG.md`
+* Added `CHANGELOG.md`.
 
 ## [1.0.0](https://github.com/SallingGroup-AI-and-ML/venv-cli/releases/tag/v1.0.0) (2023-07-13)
 

src/venv-cli/venv.sh

@@ -5,7 +5,8 @@ _green="\033[32m"
 _yellow="\033[01;33m"
 _red="\033[31m"
 
-_version="v1.0.1"
+# Version number has to follow pattern "^v\d+\.\d+\.\d+.*$"
+_version="v1.0.2"
 
 venv::_version() {
   echo "venv-cli ${_version}"

tests/test_venv_version.py

@@ -1,15 +1,17 @@
 import re
-from pathlib import Path
 
 import pytest
 
 from tests.helpers import run_command
 
+_version_pattern = re.compile(r"^venv-cli v\d+\.\d+\.\d+.*$")
+
 
 @pytest.mark.parametrize("arg", ["-V", "--version"])
-def test_venv_help(arg: str, tmp_path: Path, capfd: pytest.CaptureFixture):
-    """Checks that we can show the version number"""
-    run_command(f"venv {arg}", cwd=tmp_path)
+def test_venv_version(arg: str, capfd: pytest.CaptureFixture):
+    """Checks that we can show the version number, and that the version number
+    complies with the required pattern"""
+    run_command(f"venv {arg}")
 
-    captured = capfd.readouterr()
-    assert re.search(r"venv-cli\s\d+?\.\d+?\.\d+?", captured.out)
+    output = capfd.readouterr().out
+    assert re.match(_version_pattern, output.strip())