modernize test setup with tox

Author: jensens

.github/workflows/tests.yaml

@@ -8,42 +8,44 @@ on:
      - "opened"
   workflow_call:
   workflow_dispatch:
+
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - uses: pre-commit/action@v3.0.1
-  build:
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+      - name: Run lint with tox
+        run: uvx --with tox-uv tox -e lint
+
+  test:
     strategy:
       matrix:
-        python-version:
-          - "3.8"
-          - "3.9"
-          - "3.10"
-          - "3.11"
-          - "3.12"
         os:
           - ubuntu-latest
           - windows-latest
           - macos-latest
+        python-config:
+          - version: "3.8"
+            tox-env: "py38"
+          - version: "3.9"
+            tox-env: "py39"
+          - version: "3.10"
+            tox-env: "py310"
+          - version: "3.11"
+            tox-env: "py311"
+          - version: "3.12"
+            tox-env: "py312"
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: "pip"
-      - name: "Install Python dependencies (pip)"
-        uses: "py-actions/py-dependency-install@v4"
-        with:
-          path: "requirements.txt"
-      - name: Run Tests
-        run: |
-          git config --global protocol.file.allow always
-          pytest .
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+      - name: Set up Python ${{ matrix.python-config.version }}
+        run: uv python install ${{ matrix.python-config.version }}
+      - name: Configure git for tests
+        run: git config --global protocol.file.allow always
+      - name: Run tests with tox
+        run: uvx --with tox-uv tox -e ${{ matrix.python-config.tox-env }}

CHANGES.md

@@ -1,5 +1,10 @@
 ## Changes
 
+## 4.1.1 (unreleased)
+
+- nothing yet
+
+
 ## 4.1.0 (2025-06-03)
 
 - Support environment variable `GIT_CLONE_DEPTH` for setting a default git depth for all checkouts.  Useful for CI.

MANIFEST.in

@@ -1,7 +1,5 @@
 include *.rst
 include *.md
-exclude requirements.txt
-exclude tox.ini
 exclude .*.yaml
 recursive-include example *.ini
 recursive-include example *.txt

Makefile

@@ -44,11 +44,14 @@ EXTRA_PATH?=
 
 # Primary Python interpreter to use. It is used to create the
 # virtual environment if `VENV_ENABLED` and `VENV_CREATE` are set to `true`.
+# If global `uv` is used, this value is passed as `--python VALUE` to the venv creation.
+# uv then downloads the Python interpreter if it is not available.
+# for more on this feature read the [uv python documentation](https://docs.astral.sh/uv/concepts/python-versions/)
 # Default: python3
-PRIMARY_PYTHON?=python3
+PRIMARY_PYTHON?=3.14
 
 # Minimum required Python version.
-# Default: 3.7
+# Default: 3.9
 PYTHON_MIN_VERSION?=3.7
 
 # Install packages using the given package installer method.
@@ -63,7 +66,7 @@ PYTHON_PACKAGE_INSTALLER?=uv
 # Flag whether to use a global installed 'uv' or install
 # it in the virtual environment.
 # Default: false
-MXENV_UV_GLOBAL?=false
+MXENV_UV_GLOBAL?=true
 
 # Flag whether to use virtual environment. If `false`, the
 # interpreter according to `PRIMARY_PYTHON` found in `PATH` is used.
@@ -191,34 +194,15 @@ MXMAKE_FOLDER?=.mxmake
 # Sentinel files
 SENTINEL_FOLDER?=$(MXMAKE_FOLDER)/sentinels
 SENTINEL?=$(SENTINEL_FOLDER)/about.txt
-$(SENTINEL): Makefile
+$(SENTINEL): $(firstword $(MAKEFILE_LIST))
 	@mkdir -p $(SENTINEL_FOLDER)
 	@echo "Sentinels for the Makefile process." > $(SENTINEL)
 
 ##############################################################################
 # mxenv
 ##############################################################################
 
-# Check if given Python is installed
-ifeq (,$(shell which $(PRIMARY_PYTHON)))
-$(error "PYTHON=$(PRIMARY_PYTHON) not found in $(PATH)")
-endif
-
-# Check if given Python version is ok
-PYTHON_VERSION_OK=$(shell $(PRIMARY_PYTHON) -c "import sys; print((int(sys.version_info[0]), int(sys.version_info[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))))")
-ifeq ($(PYTHON_VERSION_OK),0)
-$(error "Need Python >= $(PYTHON_MIN_VERSION)")
-endif
-
-# Check if venv folder is configured if venv is enabled
-ifeq ($(shell [[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] && echo "true"),"true")
-$(error "VENV_FOLDER must be configured if VENV_ENABLED is true")
-endif
-
-# Check if global python is used with uv (this is not supported by uv)
-ifeq ("$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)","falseuv")
-$(error "Package installer uv does not work with a global Python interpreter.")
-endif
+OS?=
 
 # Determine the executable path
 ifeq ("$(VENV_ENABLED)", "true")
@@ -243,6 +227,16 @@ endif
 
 MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
 $(MXENV_TARGET): $(SENTINEL)
+ifneq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvfalse")
+	@$(PRIMARY_PYTHON) -c "import sys; vi = sys.version_info; sys.exit(1 if (int(vi[0]), int(vi[1])) >= tuple(map(int, '$(PYTHON_MIN_VERSION)'.split('.'))) else 0)" \
+		&& echo "Need Python >= $(PYTHON_MIN_VERSION)" && exit 1 || :
+else
+	@echo "Use Python $(PYTHON_MIN_VERSION) over uv"
+endif
+	@[[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] \
+		&& echo "VENV_FOLDER must be configured if VENV_ENABLED is true" && exit 1 || :
+	@[[ "$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)" == "falseuv" ]] \
+		&& echo "Package installer uv does not work with a global Python interpreter." && exit 1 || :
 ifeq ("$(VENV_ENABLED)", "true")
 ifeq ("$(VENV_CREATE)", "true")
 ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvtrue")
@@ -556,6 +550,10 @@ INSTALL_TARGETS+=$(ZEST_RELEASER_TARGET)
 DIRTY_TARGETS+=zest-releaser-dirty
 CLEAN_TARGETS+=zest-releaser-clean
 
+##############################################################################
+# Custom includes
+##############################################################################
+
 -include $(INCLUDE_MAKEFILE)
 
 ##############################################################################

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "mxdev"
 description = "Enable to work with Python projects containing lots of packages, of which you only want to develop some."
-version = "4.1.0"
+version = "4.1.1.dev0"
 keywords = ["pip", "vcs", "git", "development"]
 authors = [
   {name = "MX Stack Developers", email = "dev@bluedynamics.com" }
@@ -96,3 +96,25 @@ ignore = [
     "Makefile",
     "mx.ini"
 ]
+
+[tool.tox]
+requires = ["tox>=4", "tox-uv>=1"]
+env_list = ["lint", "py38", "py39", "py310", "py311", "py312", "py313", "py314"]
+
+[tool.tox.env_run_base]
+description = "Run tests with pytest and coverage"
+runner = "uv-venv-runner"
+uv_resolution = "highest"
+pass_env = ["LC_ALL", "LANG", "HOME"]
+commands = [
+    ["uv", "pip", "install", "-e", ".[test]"],
+    ["pytest", "--cov", "--cov-report=term", "--cov-branch", "{posargs:src}"]
+]
+
+[tool.tox.env.lint]
+description = "Run pre-commit hooks for linting"
+runner = "uv-venv-runner"
+commands = [
+    ["python", "-m", "pre_commit", "run", "{posargs:--all}"]
+]
+deps = ["pre-commit>=1.20.0"]