Merge branch 'main' into feature/ty-domain

Author: jensens

.github/workflows/docs.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up uv
       uses: astral-sh/setup-uv@v7

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up uv
         uses: astral-sh/setup-uv@v7

.github/workflows/release.yml

@@ -34,7 +34,7 @@
           id-token: write
 
         steps:
-          - uses: actions/checkout@v5
+          - uses: actions/checkout@v6
             with:
               fetch-depth: 0
               persist-credentials: false

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
           - windows-latest
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up uv
       uses: astral-sh/setup-uv@v7
       with:

.github/workflows/typecheck.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up uv
       uses: astral-sh/setup-uv@v7

.github/workflows/variants.yml

@@ -20,7 +20,7 @@ jobs:
           - windows-latest
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:
@@ -86,7 +86,7 @@ jobs:
         apt-get update
         apt-get install -y make curl ca-certificates git
 
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Install UV globally
       run: |

CHANGES.md

@@ -1,20 +1,27 @@
 # Changelog
 
-## 2.0.2
+## 2.2.0
 
 - Feature: Add `qa.ty` domain for Astral's ty type checker.
   ty is an extremely fast Python type checker (10-100x faster than mypy).
   Registers with both CHECK_TARGETS and TYPECHECK_TARGETS for fast feedback.
   [jensens]
 
-## 2.0.1
+## 2.1.0
 
 - Enhancement: Use tables in the generated sphinx code for topic/domains.
   [jensens, 02-11-2025]
-
+- Feature: Add monorepo support with `PROJECT_PATH_PYTHON` setting.
+  Python projects can now be located in subdirectories while keeping the Makefile at the repository root. Includes auto-detection of `pyproject.toml` in subdirectories on init, `--project-path-python` CLI flag and preseed file support.
+  Useful for monorepos with multiple applications (e.g., frontend + backend).
+  See the "Monorepo Support" section in getting-started.md for details.
 - Feature: Add `--version` (`-v`) command line flag to display mxmake version.
   [jensens, 02-11-2025]
 
+- Fix: All QA tool domains (ruff, isort, mypy, black, zpretty, pyupgrade, pyrefly) now respect the `PROJECT_PATH_PYTHON` setting when using default source paths.
+  When `PROJECT_PATH_PYTHON` is set (e.g., to `backend`), the tools automatically look for source code in the correct subdirectory (e.g., `backend/src`) instead of just `src`.
+  [jensens, 03-11-2025]
+
 ## 2.0.0 (2025-10-24)
 
 - **Breaking**: Drop Python 3.9 support. Minimum Python version is now 3.10.

LICENSE.md

@@ -1,6 +1,6 @@
 # License
 
-Copyright (c) 2022-2024, mxstack Contributors
+Copyright (c) 2022-2025, mxstack Contributors
 
 All rights reserved.
 

Makefile

@@ -42,6 +42,13 @@ INCLUDE_MAKEFILE?=include.mk
 # No default value.
 EXTRA_PATH?=
 
+# Path to Python project relative to Makefile (repository root).
+# Leave empty if Python project is in the same directory as Makefile.
+# For monorepo setups, set to subdirectory name (e.g., `backend`).
+# Future-proofed for multi-language monorepos (e.g., PROJECT_PATH_NODEJS).
+# No default value.
+PROJECT_PATH_PYTHON?=
+
 ## core.mxenv
 
 # Primary Python interpreter to use. It is used to create the
@@ -53,8 +60,8 @@ EXTRA_PATH?=
 PRIMARY_PYTHON?=3.14
 
 # Minimum required Python version.
-# Default: 3.9
-PYTHON_MIN_VERSION?=3.9
+# Default: 3.10
+PYTHON_MIN_VERSION?=3.10
 
 # Install packages using the given package installer method.
 # Supported are `pip` and `uv`. When `uv` is selected, a global installation
@@ -194,6 +201,9 @@ FORMAT_TARGETS?=
 
 export PATH:=$(if $(EXTRA_PATH),$(EXTRA_PATH):,)$(PATH)
 
+# Helper variable: adds trailing slash to PROJECT_PATH_PYTHON only if non-empty
+PYTHON_PROJECT_PREFIX=$(if $(PROJECT_PATH_PYTHON),$(PROJECT_PATH_PYTHON)/,)
+
 # Defensive settings for make: https://tech.davis-hansson.com/p/make/
 SHELL:=bash
 .ONESHELL:
@@ -337,6 +347,11 @@ CLEAN_TARGETS+=mxenv-clean
 # ruff
 ##############################################################################
 
+# Adjust RUFF_SRC to respect PROJECT_PATH_PYTHON if still at default
+ifeq ($(RUFF_SRC),src)
+RUFF_SRC:=$(PYTHON_PROJECT_PREFIX)src
+endif
+
 RUFF_TARGET:=$(SENTINEL_FOLDER)/ruff.sentinel
 $(RUFF_TARGET): $(MXENV_TARGET)
 	@echo "Install Ruff"
@@ -372,6 +387,11 @@ CLEAN_TARGETS+=ruff-clean
 # isort
 ##############################################################################
 
+# Adjust ISORT_SRC to respect PROJECT_PATH_PYTHON if still at default
+ifeq ($(ISORT_SRC),src)
+ISORT_SRC:=$(PYTHON_PROJECT_PREFIX)src
+endif
+
 ISORT_TARGET:=$(SENTINEL_FOLDER)/isort.sentinel
 $(ISORT_TARGET): $(MXENV_TARGET)
 	@echo "Install isort"
@@ -474,7 +494,7 @@ else
 	@echo "[settings]" > $(PROJECT_CONFIG)
 endif
 
-LOCAL_PACKAGE_FILES:=$(wildcard pyproject.toml setup.cfg setup.py requirements.txt constraints.txt)
+LOCAL_PACKAGE_FILES:=$(wildcard $(PYTHON_PROJECT_PREFIX)pyproject.toml $(PYTHON_PROJECT_PREFIX)setup.cfg $(PYTHON_PROJECT_PREFIX)setup.py $(PYTHON_PROJECT_PREFIX)requirements.txt $(PYTHON_PROJECT_PREFIX)constraints.txt)
 
 FILES_TARGET:=requirements-mxdev.txt
 $(FILES_TARGET): $(PROJECT_CONFIG) $(MXENV_TARGET) $(SOURCES_TARGET) $(LOCAL_PACKAGE_FILES)
@@ -609,6 +629,11 @@ CLEAN_TARGETS+=coverage-clean
 # mypy
 ##############################################################################
 
+# Adjust MYPY_SRC to respect PROJECT_PATH_PYTHON if still at default
+ifeq ($(MYPY_SRC),src)
+MYPY_SRC:=$(PYTHON_PROJECT_PREFIX)src
+endif
+
 MYPY_TARGET:=$(SENTINEL_FOLDER)/mypy.sentinel
 $(MYPY_TARGET): $(MXENV_TARGET)
 	@echo "Install mypy"

docs/source/getting-started.md

@@ -91,6 +91,101 @@ Both methods create:
 
 To update an existing Makefile without interactive prompts, run `mxmake update`.
 
+## Monorepo Support
+
+mxmake supports monorepo setups where your Python project lives in a subdirectory while the Makefile stays at the repository root.
+This is useful when you have multiple applications (e.g., frontend + backend) in one repository.
+You may need to edit `mx.ini` and set `requirements-in` or `main-package` to the subfolder.
+
+### Example Directory Structure
+
+```
+myrepo/                    # Repository root
+├── Makefile               # Generated by mxmake (at root)
+├── mx.ini                 # mxdev config (at root)
+├── .venv/                 # Virtual environment (at root)
+├── .mxmake/               # Generated files (at root)
+├── sources/               # mxdev packages (at root)
+├── frontend/              # Frontend application
+│   └── package.json
+└── backend/               # Python project in subdirectory
+    ├── pyproject.toml
+    ├── src/
+    │   └── myapp/
+    └── tests/
+```
+
+### Setup Methods
+
+#### Method 1: Auto-detection (Recommended)
+
+If `pyproject.toml` is in a subdirectory, mxmake will detect it automatically:
+
+```shell
+cd myrepo
+uvx mxmake init
+# mxmake will prompt: "Use 'backend' as PROJECT_PATH_PYTHON? (Y/n)"
+```
+
+#### Method 2: CLI Flag
+
+Specify the project path explicitly:
+
+```shell
+uvx mxmake init --project-path-python backend
+```
+
+#### Method 3: Preseed File
+
+Include in your preseed YAML:
+
+```yaml
+topics:
+  core:
+    base:
+      PROJECT_PATH_PYTHON: backend
+```
+
+Then run:
+
+```shell
+uvx mxmake init --preseeds preseed.yaml
+```
+
+### What Happens
+
+When `PROJECT_PATH_PYTHON` is set:
+
+1. **Makefile**: References Python package files with the correct path
+   - Looks for `backend/pyproject.toml` instead of `./pyproject.toml`
+
+2. **mx.ini**: Configure test/coverage paths relative to repository root
+   - Set `mxmake-test-path = backend/tests` and `mxmake-source-path = backend/src`
+
+3. **GitHub Actions**: Cache uses correct path
+   - `cache-dependency-glob: "backend/pyproject.toml"`
+
+### Configuration
+
+The `PROJECT_PATH_PYTHON` setting appears in your Makefile:
+
+```makefile
+# Path to Python project relative to Makefile (repository root)
+PROJECT_PATH_PYTHON?=backend
+```
+
+In your `mx.ini`, specify paths relative to the repository root (including the project path):
+
+```ini
+[settings]
+mxmake-test-path = backend/tests
+mxmake-source-path = backend/src
+```
+
+```{important}
+Future-proofing: This setting is named `PROJECT_PATH_PYTHON` to allow for future `PROJECT_PATH_NODEJS` support in multi-language monorepos.
+```
+
 ## How to change the settings
 
 The `Makefile` consists of three sections: