Merge branch 'v1.0.1'

Author: connesy

.github/workflows/run_tests.yml

@@ -7,7 +7,6 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
 
 permissions:
   contents: read
@@ -23,19 +22,34 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: "3.10"
+
+    - name: Install zsh
+      run: sudo apt-get update; sudo apt-get install -y zsh
+
     - name: Install dependencies
       run: |
         python3.10 -m venv .venv --prompt="venv-cli"
         . .venv/bin/activate
         python -m pip install --require-virtualenv --upgrade pip
         python -m pip install --require-virtualenv -r dev-requirements.txt
+
     - name: Check linting/formatting
       run: |
         . .venv/bin/activate
         python -m isort --check .
         python -m black --config pyproject.toml --check .
         python -m mypy --config-file pyproject.toml
-    - name: Test with pytest
+
+    - name: Test with pytest (bash)
+      run: |
+        export SHELL="/usr/bin/bash"
+        . .venv/bin/activate
+        python -m pytest -n auto .
+      shell: /usr/bin/bash -e {0}
+
+    - name: Test with pytest (zsh)
       run: |
+        export SHELL="/usr/bin/zsh"
         . .venv/bin/activate
         python -m pytest -n auto .
+      shell: /usr/bin/zsh -e {0}

CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## [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`
+
+## [1.0.0](https://github.com/SallingGroup-AI-and-ML/venv-cli/releases/tag/v1.0.0) (2023-07-13)
+
+This is the first release of the `venv-cli` tool.

src/venv-cli/venv.sh

@@ -5,7 +5,7 @@ _green="\033[32m"
 _yellow="\033[01;33m"
 _red="\033[31m"
 
-_version="1.0.0"
+_version="v1.0.1"
 
 venv::_version() {
   echo "venv-cli ${_version}"
@@ -26,7 +26,7 @@ venv::raise() {
 }
 
 venv::_check_if_help_requested() {
-  if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
+  if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
     return 0
   fi
   return 1
@@ -153,7 +153,7 @@ venv::install() {
   fi
 
   local requirements_file
-  if [ -z "$1" ] || [ "$1" == "--skip-lock" ]; then
+  if [ -z "$1" ] || [ "$1" = "--skip-lock" ]; then
     # If no argument passed
     requirements_file="requirements.txt"
 
@@ -169,16 +169,18 @@ venv::install() {
   fi
 
   local skip_lock=false
-  if [ "$1" == "--skip-lock" ]; then
+  if [ "$1" = "--skip-lock" ]; then
     skip_lock=true
     shift
   fi
 
   venv::color_echo "${_green}" "Installing requirements from ${requirements_file}"
-  pip install --require-virtualenv -r "${requirements_file}" "$@"
+  if ! pip install --require-virtualenv -r "${requirements_file}" "$@"; then
+    return 1
+  fi
 
   local lock_file="${requirements_file/.txt/.lock}"  # Replace ".txt" with ".lock"
-  if "${skip_lock}" || [ "${requirements_file}" == "${lock_file}" ]; then
+  if "${skip_lock}" || [ "${requirements_file}" = "${lock_file}" ]; then
     venv::color_echo "${_yellow}" "Skipping locking packages to ${lock_file}"
     return 0
   fi
@@ -215,7 +217,7 @@ venv::lock() {
   if [ -z "$1" ]; then
     lock_file="requirements.lock"
 
-  elif [[ "$1" == *"."* ]]; then
+  elif [[ "$1" = *"."* ]]; then
     if venv::_check_lock_requirements_file "$1"; then
       lock_file="$1"
       shift

tests/helpers.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 import sys
 from pathlib import Path
@@ -8,7 +9,7 @@
 
 
 def _command_setup(venv_cli_path: Path, activate: bool = False) -> list[str]:
-    bash = ["/bin/bash", "-c"]
+    bash = [os.environ["SHELL"], "-c"]
     source_command = f". {venv_cli_path}"
 
     additional_commands: list[str] = []