Merge pull request #1199 from lorengordon/patch/support-venv

Author: lorengordon

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.26.1
+current_version = 0.26.2
 commit = True
 message = Bumps version to {new_version}
 tag = False

CHANGELOG.md

@@ -4,6 +4,31 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### [0.26.2](https://github.com/plus3it/tardigrade-ci/releases/tag/0.26.2)
+
+**Released**: 2025.05.05
+
+**Summary**:
+
+* Prefers virtual env binaries if VIRTUAL_ENV is set
+
+* Updates tool versions:
+    * cfn-lint 1.34.2
+    * editorconfig-checker 3.2.1
+    * localstack 4.3.0
+    * golang 1.24.2
+    * moto 5.1.4
+    * pylint 3.3.7
+    * pytest 8.3.5
+    * python 3.13.3
+    * python-hcl2 7.2.0
+    * rclone 1.69.2
+    * terraform 1.11.4
+    * terragrunt 0.78.0
+    * terraform-docs 0.20.0
+    * yamllint 1.37.1
+    * yq 4.45.2
+
 ### [0.26.1](https://github.com/plus3it/tardigrade-ci/releases/tag/0.26.1)
 
 **Released**: 2025.02.18

Makefile

@@ -11,7 +11,11 @@ export GIT_LS_FILES ?= git ls-files --cached --others --exclude-standard
 # See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONUSERBASE
 export PYTHONUSERBASE ?= $(HOME)/.local
 
+ifdef VIRTUAL_ENV
+PATH := $(BIN_DIR):$(VIRTUAL_ENV)/bin:${PATH}
+else
 PATH := $(BIN_DIR):$(PYTHONUSERBASE)/bin:${PATH}
+endif
 
 MAKEFLAGS += --no-print-directory
 SHELL := bash

tests/make/python_venv_failure.bats

@@ -0,0 +1,22 @@
+#!/usr/bin/env bats
+
+TEST_DIR="$(pwd)/python_venv_failure"
+
+# create an arbitrary executable for the target to find
+function setup() {
+rm -rf "$TEST_DIR"
+mkdir -p "${TEST_DIR}/venv/bin" "${TEST_DIR}/user/.local/bin"
+touch "${TEST_DIR}/venv/bin/test.bat"
+chmod +x "${TEST_DIR}/venv/bin/test.bat"
+}
+
+@test "python/venv: failure" {
+  # If the executable is not found, the target will exit 2
+  run make guard/program/test.bat
+  [ "$status" -eq 2 ]
+  [[ "$output" == *"No rule to make target 'test.bat/install"* ]]
+}
+
+function teardown() {
+  rm -rf "$TEST_DIR"
+}

tests/make/python_venv_success.bats

@@ -0,0 +1,23 @@
+#!/usr/bin/env bats
+
+TEST_DIR="$(pwd)/python_venv_success"
+
+# create an arbitrary executable for the target to find
+function setup() {
+rm -rf "$TEST_DIR"
+mkdir -p "${TEST_DIR}/venv/bin" "${TEST_DIR}/user/.local/bin"
+touch "${TEST_DIR}/venv/bin/test.bat"
+chmod +x "${TEST_DIR}/venv/bin/test.bat"
+export VIRTUAL_ENV="${TEST_DIR}/venv"
+export PYTHONUSERBASE="${TEST_DIR}/user/.local"
+}
+
+@test "python/venv: success" {
+  # If the executable is found, the target will exit 0
+  run make guard/program/test.bat
+  [ "$status" -eq 0 ]
+}
+
+function teardown() {
+  rm -rf "$TEST_DIR"
+}