Convert project into an uv workspace (#319)

Author: ssbarnea

.pre-commit-config.yaml

@@ -48,7 +48,6 @@ repos:
     rev: v25.8.1
     hooks:
       - id: ansible-lint
-        language_version: python3.10 # minimal supported officially
         args: [--fix]
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.37.1

packages/mk-pre/README.md

@@ -0,0 +1,3 @@
+# mk-pre
+
+mk-pre plugin

packages/mk-pre/pyproject.toml

@@ -0,0 +1,19 @@
+[build-system]
+build-backend = "uv_build"
+requires = ["uv_build>=0.8.6,<0.9.0"]
+
+[project]
+authors = [{email = "sorin.sbarnea@gmail.com", name = "Sorin Sbarnea"}]
+dependencies = [
+  "rich>=12.0.0",
+  "typer>=0.16.0",
+  "typer-config>=1.4.2"
+]
+description = "mk-pre plugin"
+name = "mk-pre"
+readme = "README.md"
+requires-python = ">=3.10.0"
+version = "0.1.0"
+
+[project.entry-points."mk_tools"]
+pre = "mk_pre.pre:PreTool"

packages/mk-pre/src/mk_pre/__init__.py

@@ -9,8 +9,8 @@
 from pathlib import Path
 
 from mk.exec import run_or_fail
-from mk.pre import CFG_FILE
 from mk.tools import Action, Tool
+from mk_pre.__main__ import CFG_FILE
 
 
 class PreTool(Tool):

src/mk/pre.py packages/mk-pre/src/mk_pre/__main__.pysrc/mk/pre.py renamed to packages/mk-pre/src/mk_pre/__main__.py

@@ -1,9 +1,8 @@
 """Tests"""
 
+from mk_pre.__main__ import app
 from typer.testing import CliRunner
 
-from mk.pre import app
-
 runner = CliRunner()
 
 

src/mk/tools/pre.py packages/mk-pre/src/mk_pre/pre.pysrc/mk/tools/pre.py renamed to packages/mk-pre/src/mk_pre/pre.py

@@ -51,6 +51,7 @@ lower = [
   "typer-config==1.4.2",
   "typer==0.16.0"
 ]
+pkg = ["tomli>=2.2.1; python_version<'3.11'"]
 
 [project]
 authors = [{"email" = "sorin.sbarnea@gmail.com", "name" = "Sorin Sbarnea"}]
@@ -87,8 +88,8 @@ dependencies = [
   "subprocess-tee>=0.4.1",
   "tomli>=2.0.1 ; python_full_version < '3.11'",
   "twine>=3.4.1",
-  "typer-config>=1.4.0",
-  "typer>=0.16.0"
+  "typer>=0.16.0",
+  "mk-pre"
 ]
 dynamic = ["version"]
 license = "MIT"
@@ -104,7 +105,6 @@ git = "mk.tools.git:GitTool"
 make = "mk.tools.make:MakeTool"
 node = "mk.tools.node:NodeTool"
 nox = "mk.tools.nox:NoxTool"
-pre = "mk.tools.pre:PreTool"
 pre-commit = "mk.tools.pre_commit:PreCommitTool"
 pypackage = "mk.tools.py_package:PyPackageTool"
 pytest = "mk.tools.pytest:PyTestTool"
@@ -179,13 +179,22 @@ profile = "black"
 [tool.mypy]
 color_output = true
 error_summary = true
-exclude = [".ansible", ".cache", ".tox", "build", "dist"]
+exclude = [
+  ".ansible",
+  ".cache",
+  ".tox",
+  ".venv",
+  "node_modules",
+  "build",
+  "dist",
+  "site"
+]
 python_version = "3.10"
 strict = true
 
 [[tool.mypy.overrides]]
 ignore_missing_imports = true
-module = ["diskcache", "pytest_benchmark.fixture"]
+module = ["git.*", "diskcache", "pytest_benchmark.fixture"]
 
 [tool.ruff]
 # Same as Black.
@@ -222,7 +231,7 @@ ignore = [
 select = ["ALL"]
 flake8-pytest-style.parametrize-values-type = "tuple"
 isort.known-first-party = ["mk"]
-per-file-ignores."test/**/*.py" = ["S"]
+per-file-ignores."**/test/**/*.py" = ["S"]
 pydocstyle.convention = "google"
 
 [tool.setuptools_scm]
@@ -252,9 +261,9 @@ env_list = ["py", "lint", "docs", "pkg", "lower", "devel", "integration"]
 requires = [
   "pip>=24",
   "setuptools>=65.3",
-  "tox>=4.28.3",
+  "tox>=4.28.4",
   "tox-extra>=2.1",
-  "tox-uv>=1.27"
+  "tox-uv>=1.28"
 ]
 skip_missing_interpreters = true
 
@@ -333,14 +342,12 @@ commands = [
 ]
 description = "Builds docs"
 extras = ["docs"]
-package = "editable"
 skip_install = false
 
 [tool.tox.env.integration]
 commands = [["ansible", "--version"], ["nox", "--version"], ["mk", "test-integration"]]
 dependency_groups = ["integration"]
 description = "Run integrations tests"
-package = "editable"
 
 [tool.tox.env.lint]
 commands = [
@@ -360,15 +367,18 @@ runner = "uv-venv-runner"
 skip_install = true
 
 [tool.tox.env.lower]
+commands_post = [["uv", "pip", "check"]]
 dependency_groups = ["dev", "lower"]
 description = "Run the tests with lower constraints dependencies"
+editable = true
 runner = "uv-venv-runner"
 
 [tool.tox.env.pkg]
 commands = [["bash", "./tools/pkg.sh"]]
 commands_post = []
 commands_pre = []
 description = "Build package, verify metadata, install package and assert behavior when ansible is missing."
+group = "pkg"
 skip_install = true
 
 [tool.tox.env_run_base]
@@ -437,3 +447,11 @@ TERM = "dump"
 # do not include 'lower' constraints in default groups
 default-groups = ["dev", "docs"]
 package = true
+
+[tool.uv.sources]
+mk-pre = {workspace = true}
+
+[tool.uv.workspace]
+members = ["packages/*"]
+
+# exclude = ["packages/seeds"]

packages/mk-pre/src/mk_pre/py.typed

@@ -1,19 +1,31 @@
 #!/usr/bin/env bash
 # cspell: ignore euox
-set -euox pipefail
-env | grep TOX
+set -euo pipefail
+
+PROJECT=$(python -c '''
+import sys
+if sys.version_info >= (3, 11):
+    import tomllib
+else:  # pragma: no cover (py311+)
+    import tomli as tomllib
+print(tomllib.load(open("pyproject.toml","rb"))["project"]["name"])
+''')
+echo "Packaging sanity testing for '${PROJECT}' ..."
+rm -rf dist
+python3 -c "import os.path, shutil, sys; dist_dir = 'dist'; os.path.isdir(dist_dir) or sys.exit(0); print('Removing {!s} contents...'.format(dist_dir), file=sys.stderr); shutil.rmtree(dist_dir)"
+# We cannot use python build for workspaces as it does not --all-packages
+# python3 -m build
+uv build --all-packages
+
+python3 -m twine check --strict dist/*
+
+echo "Building wheels cache into .cache/wheels ..."
+pip download -q --find-links=dist --dest=./.cache/wheels "dist/${PROJECT}-"*.whl
 
 echo "Isolate pipx for testing..."
 export PIPX_HOME="${TOX_WORK_DIR:-.tox}/.pipx"
 export PIPX_BIN_DIR="${PIPX_HOME}/bin"
 export PATH="${PIPX_BIN_DIR}:${PATH}"
+# shellcheck disable=SC2034
 rm -rf "${PIPX_HOME}"
-pipx install --force -e .
-
-rm -rf dist
-python3 -c "import os.path, shutil, sys; dist_dir = 'dist'; os.path.isdir(dist_dir) or sys.exit(0); print('Removing {!s} contents...'.format(dist_dir), file=sys.stderr); shutil.rmtree(dist_dir)"
-python3 -m build
-
-python3 -m twine check --strict dist/*
-python3 -m pip install "mk @ file://$(pwd)/$(echo dist/*.whl)"
-python3 -m pip uninstall -y mk
+PIP_ARGS="--find-links=.cache/wheels --find-links=.dist" pipx install --force "${PROJECT}"