Release v1.4.1 (#22)

Author: connesy

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [Unreleased](https://github.com/SallingGroup-AI-and-ML/venv-cli/tree/develop)
 
+## [v1.4.1](https://github.com/SallingGroup-AI-and-ML/venv-cli/releases/tag/v1.4.1) (2023-10-30)
+
+### Bugfixes
+* Fixed `venv lock` failing to lock when called as part of `venv install`. [#21](https://github.com/SallingGroup-AI-and-ML/venv-cli/pull/21)
+
 ## [v1.4.0](https://github.com/SallingGroup-AI-and-ML/venv-cli/releases/tag/v1.4.0) (2023-10-30)
 
 ### Minor changes

src/venv-cli/venv.sh

@@ -9,7 +9,7 @@ _yellow="\033[01;33m"
 _red="\033[31m"
 
 # Version number has to follow pattern "^v\d+\.\d+\.\d+.*$"
-_version="v1.4.0"
+_version="v1.4.1"
 
 # Valid VCS URL environment variable pattern
 # https://peps.python.org/pep-0610/#specification
@@ -226,7 +226,7 @@ venv::install() {
     return "${_success}"
   fi
 
-  venv::lock "${requirements_file}" "${lock_file}"
+  venv::lock "${lock_file}"
   return "$?"  # Return exit status from venv::lock command
 }
 

tests/test_venv_install.py

@@ -6,7 +6,7 @@
 from pytest_cases import parametrize_with_cases
 
 from tests.helpers import run_command, write_files
-from tests.test_venv_install_cases import CasesVenvInstallRequirementstxt
+from tests.test_venv_install_cases import CasesVenvInstallRequirementstxt, CasesVenvInstallWithLock
 from tests.types import RequirementsBase, RequirementsDict
 
 _package_name_regex = re.compile(r"^([a-zA-Z0-9_-]+)\b")
@@ -60,3 +60,19 @@ def test_venv_install_requirements(
             continue
 
         _check_package_was_installed(requirement=requirement, installed_line=installed_line)
+
+
+@pytest.mark.order(after="test_venv_activate.py::test_venv_activate")
+@parametrize_with_cases(argnames=["files", "requirements_base"], cases=CasesVenvInstallWithLock)
+def test_venv_install_with_lock(
+    files: RequirementsDict,
+    requirements_base: RequirementsBase,
+    tmp_path: Path,
+):
+    write_files(files=files, dir=tmp_path)
+
+    run_command(
+        f"venv install {requirements_base}.txt",
+        cwd=tmp_path,
+        activated=True,
+    )

tests/test_venv_install_cases.py

@@ -54,3 +54,14 @@ def case_git_dev(self) -> tuple[RawFilesDict, RequirementsBase]:
             "dev-requirements.txt": dev_requirements_txt,
         }
         return files, RequirementsBase.dev_requirements
+
+
+class CasesVenvInstallWithLock:
+    @collect_requirements
+    def case_pypi(self) -> tuple[RawFilesDict, RequirementsBase]:
+        requirements_txt = [
+            "python-json-logger==2.0.7",
+        ]
+
+        files = {"requirements.txt": requirements_txt}
+        return files, RequirementsBase.requirements