checkout packages in mx.ini. remove obsolete lines in pyproject.toml

Author: lenadax

.gitignore

@@ -4,7 +4,9 @@
 /.mxmake
 /.ruff_cache
 /.venv
+/build
 /dist/
 /htmlcov/
 /requirements-mxdev.txt
-/build
+/constraints-mxdev.txt
+/sources/

Makefile

@@ -2,10 +2,12 @@
 # THIS FILE IS GENERATED BY MXMAKE
 #
 # DOMAINS:
+#: applications.zest-releaser
 #: core.base
 #: core.mxenv
 #: core.mxfiles
 #: core.packages
+#: core.sources
 #: qa.coverage
 #: qa.test
 #
@@ -37,30 +39,41 @@ 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
 # 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
 
 # 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`. If uv is used, its global availability is
-# checked. Otherwise, it is installed, either in the virtual environment or
-# using the `PRIMARY_PYTHON`, dependent on the `VENV_ENABLED` setting. If
-# `VENV_ENABLED` and uv is selected, uv is used to create the virtual
-# environment.
+# Supported are `pip` and `uv`. When `uv` is selected, a global installation
+# is auto-detected and used if available. Otherwise, uv is installed in the
+# virtual environment or using `PRIMARY_PYTHON`, depending on the
+# `VENV_ENABLED` setting.
 # Default: pip
 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
+# Python version for UV to install/use when creating virtual
+# environments with global UV. Passed to `uv venv -p VALUE`. Supports version
+# specs like `3.11`, `3.14`, `cpython@3.14`. Defaults to PRIMARY_PYTHON value
+# for backward compatibility.
+# Default: $(PRIMARY_PYTHON)
+UV_PYTHON?=$(PRIMARY_PYTHON)
 
 # Flag whether to use virtual environment. If `false`, the
 # interpreter according to `PRIMARY_PYTHON` found in `PATH` is used.
@@ -107,7 +120,7 @@ PACKAGES_ALLOW_PRERELEASES?=false
 # The command which gets executed. Defaults to the location the
 # :ref:`run-tests` template gets rendered to if configured.
 # Default: .mxmake/files/run-tests.sh
-TEST_COMMAND?=$(VENV_FOLDER)/bin/pytest src/node/tests
+TEST_COMMAND?=.mxmake/files/run-tests.sh
 
 # Additional Python requirements for running tests to be
 # installed (via pip).
@@ -123,12 +136,25 @@ TEST_DEPENDENCY_TARGETS?=
 # The command which gets executed. Defaults to the location the
 # :ref:`run-coverage` template gets rendered to if configured.
 # Default: .mxmake/files/run-coverage.sh
-COVERAGE_COMMAND?=\
-	$(VENV_FOLDER)/bin/coverage run \
-		--source=src/node \
-		--omit=src/node/testing/profiling.py \
-		-m pytest src/node/tests \
-	&& $(VENV_FOLDER)/bin/coverage report --fail-under=100
+COVERAGE_COMMAND?=.mxmake/files/run-coverage.sh
+
+## applications.zest-releaser
+
+# Options to pass to zest.releaser prerelease command.
+# No default value.
+ZEST_RELEASER_PRERELEASE_OPTIONS?=
+
+# Options to pass to zest.releaser release command.
+# No default value.
+ZEST_RELEASER_RELEASE_OPTIONS?=
+
+# Options to pass to zest.releaser postrelease command.
+# No default value.
+ZEST_RELEASER_POSTRELEASE_OPTIONS?=
+
+# Options to pass to zest.releaser fullrelease command.
+# No default value.
+ZEST_RELEASER_FULLRELEASE_OPTIONS?=
 
 ##############################################################################
 # END SETTINGS - DO NOT EDIT BELOW THIS LINE
@@ -144,6 +170,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:
@@ -168,7 +197,7 @@ $(SENTINEL): $(firstword $(MAKEFILE_LIST))
 # mxenv
 ##############################################################################
 
-export OS:=$(OS)
+OS?=
 
 # Determine the executable path
 ifeq ("$(VENV_ENABLED)", "true")
@@ -184,26 +213,61 @@ else
 MXENV_PYTHON=$(PRIMARY_PYTHON)
 endif
 
-# Determine the package installer
+# Determine the package installer with non-interactive flags
 ifeq ("$(PYTHON_PACKAGE_INSTALLER)","uv")
-PYTHON_PACKAGE_COMMAND=uv pip
+PYTHON_PACKAGE_COMMAND=uv pip --no-progress
 else
 PYTHON_PACKAGE_COMMAND=$(MXENV_PYTHON) -m pip
 endif
 
+# Auto-detect global uv availability (simple existence check)
+ifeq ("$(PYTHON_PACKAGE_INSTALLER)","uv")
+UV_AVAILABLE:=$(shell command -v uv >/dev/null 2>&1 && echo "true" || echo "false")
+else
+UV_AVAILABLE:=false
+endif
+
+# Determine installation strategy
+# depending on the PYTHON_PACKAGE_INSTALLER and UV_AVAILABLE
+# - both vars can be false or
+# - one of them can be true,
+# - but never boths.
+USE_GLOBAL_UV:=$(shell [[ "$(PYTHON_PACKAGE_INSTALLER)" == "uv" && "$(UV_AVAILABLE)" == "true" ]] && echo "true" || echo "false")
+USE_LOCAL_UV:=$(shell [[ "$(PYTHON_PACKAGE_INSTALLER)" == "uv" && "$(UV_AVAILABLE)" == "false" ]] && echo "true" || echo "false")
+
+# Check if global UV is outdated (non-blocking warning)
+ifeq ("$(USE_GLOBAL_UV)","true")
+UV_OUTDATED:=$(shell uv self update --dry-run 2>&1 | grep -q "Would update" && echo "true" || echo "false")
+else
+UV_OUTDATED:=false
+endif
+
 MXENV_TARGET:=$(SENTINEL_FOLDER)/mxenv.sentinel
 $(MXENV_TARGET): $(SENTINEL)
+	# Validation: Check Python version if not using global uv
+ifneq ("$(USE_GLOBAL_UV)","true")
 	@$(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 "Using global uv for Python $(UV_PYTHON)"
+endif
+	# Validation: Check VENV_FOLDER is set if venv enabled
 	@[[ "$(VENV_ENABLED)" == "true" && "$(VENV_FOLDER)" == "" ]] \
 		&& echo "VENV_FOLDER must be configured if VENV_ENABLED is true" && exit 1 || :
-	@[[ "$(VENV_ENABLED)$(PYTHON_PACKAGE_INSTALLER)" == "falseuv" ]] \
+	# Validation: Check uv not used with system Python
+	@[[ "$(VENV_ENABLED)" == "false" && "$(PYTHON_PACKAGE_INSTALLER)" == "uv" ]] \
 		&& echo "Package installer uv does not work with a global Python interpreter." && exit 1 || :
+	# Warning: Notify if global UV is outdated
+ifeq ("$(UV_OUTDATED)","true")
+	@echo "WARNING: A newer version of uv is available. Run 'uv self update' to upgrade."
+endif
+
+	# Create virtual environment
 ifeq ("$(VENV_ENABLED)", "true")
 ifeq ("$(VENV_CREATE)", "true")
-ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvtrue")
-	@echo "Setup Python Virtual Environment using package 'uv' at '$(VENV_FOLDER)'"
-	@uv venv -p $(PRIMARY_PYTHON) --seed $(VENV_FOLDER)
+ifeq ("$(USE_GLOBAL_UV)","true")
+	@echo "Setup Python Virtual Environment using global uv at '$(VENV_FOLDER)'"
+	@uv venv --allow-existing --no-progress -p $(UV_PYTHON) --seed $(VENV_FOLDER)
 else
 	@echo "Setup Python Virtual Environment using module 'venv' at '$(VENV_FOLDER)'"
 	@$(PRIMARY_PYTHON) -m venv $(VENV_FOLDER)
@@ -213,10 +277,14 @@ endif
 else
 	@echo "Using system Python interpreter"
 endif
-ifeq ("$(PYTHON_PACKAGE_INSTALLER)$(MXENV_UV_GLOBAL)","uvfalse")
-	@echo "Install uv"
+
+	# Install uv locally if needed
+ifeq ("$(USE_LOCAL_UV)","true")
+	@echo "Install uv in virtual environment"
 	@$(MXENV_PYTHON) -m pip install uv
 endif
+
+	# Install/upgrade core packages
 	@$(PYTHON_PACKAGE_COMMAND) install -U pip setuptools wheel
 	@echo "Install/Update MXStack Python packages"
 	@$(PYTHON_PACKAGE_COMMAND) install -U $(MXDEV) $(MXMAKE)
@@ -244,6 +312,31 @@ INSTALL_TARGETS+=mxenv
 DIRTY_TARGETS+=mxenv-dirty
 CLEAN_TARGETS+=mxenv-clean
 
+##############################################################################
+# sources
+##############################################################################
+
+SOURCES_TARGET:=$(SENTINEL_FOLDER)/sources.sentinel
+$(SOURCES_TARGET): $(PROJECT_CONFIG) $(MXENV_TARGET)
+	@echo "Checkout project sources"
+	@mxdev -f -c $(PROJECT_CONFIG)
+	@touch $(SOURCES_TARGET)
+
+.PHONY: sources
+sources: $(SOURCES_TARGET)
+
+.PHONY: sources-dirty
+sources-dirty:
+	@rm -f $(SOURCES_TARGET)
+
+.PHONY: sources-purge
+sources-purge: sources-dirty
+	@rm -rf sources
+
+INSTALL_TARGETS+=sources
+DIRTY_TARGETS+=sources-dirty
+PURGE_TARGETS+=sources-purge
+
 ##############################################################################
 # mxfiles
 ##############################################################################
@@ -271,7 +364,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)
@@ -402,6 +495,48 @@ INSTALL_TARGETS+=$(COVERAGE_TARGET)
 DIRTY_TARGETS+=coverage-dirty
 CLEAN_TARGETS+=coverage-clean
 
+##############################################################################
+# zest-releaser
+##############################################################################
+
+ZEST_RELEASER_TARGET:=$(SENTINEL_FOLDER)/zest-releaser.sentinel
+$(ZEST_RELEASER_TARGET): $(MXENV_TARGET)
+	@echo "Install zest.releaser"
+	@$(PYTHON_PACKAGE_COMMAND) install zest.releaser
+	@touch $(ZEST_RELEASER_TARGET)
+
+.PHONY: zest-releaser-prerelease
+zest-releaser-prerelease: $(ZEST_RELEASER_TARGET)
+	@echo "Run prerelease"
+	@prerelease $(ZEST_RELEASER_PRERELEASE_OPTIONS)
+
+.PHONY: zest-releaser-release
+zest-releaser-release: $(ZEST_RELEASER_TARGET)
+	@echo "Run release"
+	@release $(ZEST_RELEASER_RELEASE_OPTIONS)
+
+.PHONY: zest-releaser-postrelease
+zest-releaser-postrelease: $(ZEST_RELEASER_TARGET)
+	@echo "Run postrelease"
+	@postrelease $(ZEST_RELEASER_POSTRELEASE_OPTIONS)
+
+.PHONY: zest-releaser-fullrelease
+zest-releaser-fullrelease: $(ZEST_RELEASER_TARGET)
+	@echo "Run fullrelease"
+	@fullrelease $(ZEST_RELEASER_FULLRELEASE_OPTIONS)
+
+.PHONY: zest-releaser-dirty
+zest-releaser-dirty:
+	@rm -f $(ZEST_RELEASER_TARGET)
+
+.PHONY: zest-releaser-clean
+zest-releaser-clean: zest-releaser-dirty
+	@test -e $(MXENV_PYTHON) && $(MXENV_PYTHON) -m pip uninstall -y zest.releaser || :
+
+INSTALL_TARGETS+=$(ZEST_RELEASER_TARGET)
+DIRTY_TARGETS+=zest-releaser-dirty
+CLEAN_TARGETS+=zest-releaser-clean
+
 ##############################################################################
 # Custom includes
 ##############################################################################

mx.ini

@@ -1,2 +1,58 @@
 [settings]
+threads = 5
+
+# conestack git URLs
+cs = https://github.com/conestack
+cs_push = git@github.com:conestack
+
+# checkout source packages
+checkout_packages = true
+
+# feature branch to checkout
+feature_branch = refactor-package-layout
+
+# main package
 main-package = -e .[test]
+
+mxmake-test-runner = pytest
+# fixed dependency package versions
+version-overrides =
+    pyramid==2.0.2
+
+# templates and environment
+mxmake-templates =
+    run-tests
+    run-coverage
+
+mxmake-test-path = src
+mxmake-source-path = src/node
+
+[mxmake-env]
+TESTRUN_MARKER = 1
+
+[mxmake-run-tests]
+environment = env
+
+[mxmake-run-coverage]
+environment = env
+
+###############################################################################
+# base packages
+###############################################################################
+
+[odict]
+use = ${settings:checkout_packages}
+url = ${settings:cs}/odict.git
+pushurl = ${settings:cs_push}/odict.git
+branch = ${settings:feature_branch}
+mxmake-test-path = tests
+mxmake-source-path = src/odict
+
+[plumber]
+use = ${settings:checkout_packages}
+url = ${settings:cs}/plumber.git
+pushurl = ${settings:cs_push}/plumber.git
+branch = ${settings:feature_branch}
+extras = test
+mxmake-test-path = tests
+mxmake-source-path = src/plumber

pyproject.toml

@@ -41,12 +41,6 @@ test = [
 [project.urls]
 Homepage = "http://github.com/conestack/node"
 
-[tool.hatch.version]
-source = "vcs"
-
-[tool.hatch.metadata]
-allow-direct-references = true
-
 [tool.hatch.metadata.hooks.fancy-pypi-readme]
 content-type = "text/x-rst"