tests should fail when they fail tho

Author: otakup0pe

Makefile

@@ -27,36 +27,34 @@ format: ## Format code with black and other formatters
 # Convenience molecule targets (Ubuntu)
 molecule-2204-no-uv:
 	@echo "molecule: ubuntu-22.04 (no uv)"
-	LOG=molecule-2204-no-uv.log; \
-	( MOLECULE_OS=ubuntu MOLECULE_VERSION=2204 PYTHON_UV_INSTALL=false $(molecule) test -s default 2>&1 | tee $$LOG ) || ( echo "FAILED: see $$LOG"; cat $$LOG; false )
+	@LOG=molecule-2204-no-uv.log; \
+	bash -o pipefail -c "MOLECULE_OS=ubuntu MOLECULE_VERSION=2204 PYTHON_UV_INSTALL=false $(molecule) test -s default 2>&1 | tee $$LOG" || \
+	( echo "FAILED: see $$LOG"; cat $$LOG; exit 1 )
 
 molecule-2404-no-uv:
 	@echo "molecule: ubuntu-24.04 (no uv)"
-	LOG=molecule-2404-no-uv.log; \
-	( MOLECULE_OS=ubuntu MOLECULE_VERSION=2404 PYTHON_UV_INSTALL=false $(molecule) test -s default 2>&1 | tee $$LOG ) || ( echo "FAILED: see $$LOG"; cat $$LOG; false )
+	@LOG=molecule-2404-no-uv.log; \
+	bash -o pipefail -c "MOLECULE_OS=ubuntu MOLECULE_VERSION=2404 PYTHON_UV_INSTALL=false $(molecule) test -s default 2>&1 | tee $$LOG" || \
+	( echo "FAILED: see $$LOG"; cat $$LOG; exit 1 )
 
 molecule-2404-uv:
 	@echo "molecule: ubuntu-24.04 (with uv)"
-	LOG=molecule-2404-uv.log; \
-	( MOLECULE_OS=ubuntu MOLECULE_VERSION=2404 PYTHON_UV_INSTALL=true PYTHON_UV_SUFFIX="-alt" $(molecule) test -s default 2>&1 | tee $$LOG ) || ( echo "FAILED: see $$LOG"; cat $$LOG; false )
+	@LOG=molecule-2404-uv.log; \
+	bash -o pipefail -c "MOLECULE_OS=ubuntu MOLECULE_VERSION=2404 PYTHON_UV_INSTALL=true PYTHON_UV_SUFFIX="-alt" $(molecule) test -s default 2>&1 | tee $$LOG" || \
+	( echo "FAILED: see $$LOG"; cat $$LOG; exit 1 )
 
 # Convenience molecule targets (Debian 13)
 molecule-debian-13-no-uv:
 	@echo "molecule: debian-13 (no uv)"
-	LOG=molecule-debian-13-no-uv.log; \
-	( MOLECULE_OS=debian MOLECULE_VERSION=13 MOLECULE_IMAGE=${MOLECULE_IMAGE:-geerlingguy/docker-debian13-ansible:latest} PYTHON_UV_INSTALL=false $(molecule) test -s default 2>&1 | tee $$LOG ) || ( echo "FAILED: see $$LOG"; cat $$LOG; false )
+	@LOG=molecule-debian-13-no-uv.log; \
+	bash -o pipefail -c "MOLECULE_OS=debian MOLECULE_VERSION=13 PYTHON_UV_INSTALL=false $(molecule) test -s default 2>&1 | tee $$LOG" || \
+	( echo "FAILED: see $$LOG"; cat $$LOG; exit 1 )
 
 molecule-debian-13-uv:
 	@echo "molecule: debian-13 (with uv)"
-	LOG=molecule-debian-13-uv.log; \
-	( MOLECULE_OS=debian MOLECULE_VERSION=13 MOLECULE_IMAGE=${MOLECULE_IMAGE:-geerlingguy/docker-debian13-ansible:latest} PYTHON_UV_INSTALL=true PYTHON_UV_SUFFIX="-alt" $(molecule) test -s default 2>&1 | tee $$LOG ) || ( echo "FAILED: see $$LOG"; cat $$LOG; false )
-
-# Generic runner: allows invocation like:
-#   make molecule-run MOLECULE_OS=debian MOLECULE_VERSION=13 MOLECULE_IMAGE=... PYTHON_UV_INSTALL=false
-molecule-run:
-	@echo "molecule: ${MOLECULE_OS:-ubuntu}-${MOLECULE_VERSION:-2404} (uv=${PYTHON_UV_INSTALL:-true})"
-	LOG=molecule-${MOLECULE_OS:-ubuntu}-${MOLECULE_VERSION:-2404}-$$( [ "${PYTHON_UV_INSTALL:-true}" = "true" ] && echo uv || echo no-uv ).log; \
-	( MOLECULE_OS="${MOLECULE_OS:-ubuntu}" MOLECULE_VERSION="${MOLECULE_VERSION:-2404}" MOLECULE_IMAGE="${MOLECULE_IMAGE:-geerlingguy/docker-${MOLECULE_OS:-ubuntu}${MOLECULE_VERSION:-2404}-ansible:latest}" PYTHON_UV_INSTALL="${PYTHON_UV_INSTALL:-true}" PYTHON_UV_SUFFIX="${PYTHON_UV_SUFFIX}" $(molecule) test -s default 2>&1 | tee $$LOG ) || ( echo "FAILED: see $$LOG"; cat $$LOG; false )
+	@LOG=molecule-debian-13-uv.log; \
+	bash -o pipefail -c "MOLECULE_OS=debian MOLECULE_VERSION=13 PYTHON_UV_INSTALL=true PYTHON_UV_SUFFIX="-alt" $(molecule) test -s default 2>&1 | tee $$LOG" || \
+	( echo "FAILED: see $$LOG"; cat $$LOG; exit 1 )
 
 act-download: ## download act
 	@if [ ! -f "$(ACT_BINARY)" ]; then \
@@ -71,7 +69,7 @@ test_workflow: act-download ## Run GitHub workflows, but locally
 	@echo "Running Tests!"
 	$(ACT_BINARY)
 
-test: molecule
+test: lint molecule
 
 molecule-destroy:
 	$(molecule) destroy

README.md

@@ -1,28 +1,26 @@
-## ANXS - python
+## [ANXS](http://anxs.io/) - python
 
 ![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/anxs/python/github-workflow-molecule.yml)
 ![Maintenance](https://img.shields.io/maintenance/yes/2025.svg)
 ![Ansible Role](https://img.shields.io/ansible/role/d/anxs/python)
+![GitHub License](https://img.shields.io/github/license/anxs/python)
 
 Ansible role which installs python, pip, virtualenv, and uv
 
-#### Requirements & Dependencies
-- Tested on Ansible 2.12 or higher.
+## Requirements & Dependencies
 
-#### Variables
+* Tested on Ansible 2.12 or higher.
 
-```yaml
-python_setuptools_version:    # default to latest
-python_virtualenv_version:    # default to latestlenv
-```
+## Variables
 
-## Testing
+This is a partial listing of configurable variables
 
-This project uses molecule to test a few scenarios. You can kick off the tests (and linting) with `make test`.
+* `python_versions` is a list of python versions to install from the [deadsnakes](https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa) PPA.
+* `python_uv_version` can be set to `true` to install [uv](https://github.com/astral-sh/uv).
 
-## License
+## Testing
 
-Licensed under the MIT License. See the [LICENSE](https://github.com/ANXS/python/blob/master/LICENSE) file for details.
+This project uses molecule to test a few scenarios. You can kick off the tests (and linting) with `make test`.
 
 ## Feedback, bug-reports, requests, ...
 

molecule/default/molecule.yml

@@ -7,7 +7,7 @@ driver:
 
 platforms:
   - name: "anxs-python-${MOLECULE_OS:-ubuntu}-${MOLECULE_VERSION:-2404}${PYTHON_UV_SUFFIX}"
-    image: "${MOLECULE_IMAGE:-geerlingguy/docker-ubuntu2404-ansible:latest}"
+    image: "geerlingguy/docker-${MOLECULE_OS:-ubuntu}${MOLECULE_VERSION:-2404}-ansible:latest"
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true

molecule/default/tests/test_python_installation.py

@@ -50,23 +50,29 @@ def _detect_os_release(self, host):
     def test_python_packages_can_be_installed(self, host):
         """Test that pip can install packages system-wide on supported distros
 
-        This test runs only on distributions which support system-level pip
-        installs (Ubuntu, or Debian older than 13). On Debian 13+ we skip this
-        because some packaging changes make system-level pip installs unreliable
-        in CI images.
+        This test runs only on distributions which support
+        system-level pip installs. On Debian 13+ and Ubuntu 24.04+ we
+        skip this because some packaging changes make system-level pip
+        installs unreliable in CI images.
+
         """
         osr = self._detect_os_release(host)
         distro = osr.get('ID', '').lower()
         version = osr.get('VERSION_ID', '')
 
-        # Skip system-level pip install test on Debian 13 and newer
-        if distro == 'debian' and version:
+        # Skip system-level pip install test on recent os
+        major = None
+        if version:
             try:
                 major = int(version.split('.')[0])
             except Exception:
-                major = None
-            if major and major >= 13:
-                pytest.skip("System-level pip installs are skipped on Debian 13+")
+                pass
+
+        if distro == 'debian' and major and major >= 13:
+            pytest.skip(f"System-level pip installs are skipped on Debian {version}")
+
+        elif distro == 'ubuntu' and major and major >= 24:
+            pytest.skip(f"System-level pip installs are skipped on Ubuntu {version}")
 
         # Attempt a system-level install (CI runs as root inside molecule by
         # default). We install a small package and assert success.