From 33cefca81d68980f1de208694217667ce187e53b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Tue, 17 Feb 2026 22:27:29 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(tox):=20migrate=20tox.ini?= =?UTF-8?q?=20to=20tox.toml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tox ecosystem has moved to native TOML configuration. Switch from the legacy INI format and update the pre-commit hook from tox-ini-fmt to tox-toml-fmt v1.7.0. --- .pre-commit-config.yaml | 7 ++--- tox.ini | 67 ----------------------------------------- tox.toml | 65 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 71 deletions(-) delete mode 100644 tox.ini create mode 100644 tox.toml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d045f03..b1a0108 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,11 +14,10 @@ repos: hooks: - id: codespell additional_dependencies: ["tomli>=2.3"] - - repo: https://github.com/tox-dev/tox-ini-fmt - rev: "1.7.1" + - repo: https://github.com/tox-dev/tox-toml-fmt + rev: "v1.7.0" hooks: - - id: tox-ini-fmt - args: ["-p", "fix"] + - id: tox-toml-fmt - repo: https://github.com/tox-dev/pyproject-fmt rev: "v2.16.0" hooks: diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 8fbcabc..0000000 --- a/tox.ini +++ /dev/null @@ -1,67 +0,0 @@ -[tox] -requires = - tox>=4.32 - tox-uv>=1.29 -env_list = - fix - 3.14 - 3.13 - 3.12 - 3.11 - type - 3.14t - pkg_meta -skip_missing_interpreters = true - -[testenv] -description = run the unit tests with pytest under {base_python} -package = wheel -wheel_build_env = .pkg -extras = - testing -pass_env = - PYTEST_* -set_env = - COVERAGE_FILE = {work_dir}/.coverage.{env_name} -commands = - python -m pytest {tty:--color=yes} {posargs: \ - --cov {env_site_packages_dir}{/}sphinx_argparse_cli --cov {tox_root}{/}tests \ - --cov-config=pyproject.toml --no-cov-on-fail --cov-report term-missing:skip-covered --cov-context=test \ - --cov-report html:{env_tmp_dir}{/}htmlcov --cov-report xml:{work_dir}{/}coverage.{env_name}.xml \ - --junitxml {work_dir}{/}junit.{env_name}.xml \ - tests} - -[testenv:fix] -description = format the code base to adhere to our styles, and complain about what we cannot do automatically -skip_install = true -deps = - pre-commit-uv>=4.2 -commands = - pre-commit run --all-files --show-diff-on-failure - -[testenv:type] -description = run type check on code base -deps = - mypy==1.19 - types-docutils>=0.22.3.20251115 -commands = - mypy src tests {posargs} - -[testenv:pkg_meta] -description = check that the long description is valid -skip_install = true -deps = - check-wheel-contents>=0.6.3 - twine>=6.2 - uv>=0.9.16 -commands = - uv build --sdist --wheel --out-dir {env_tmp_dir} . - twine check {env_tmp_dir}{/}* - check-wheel-contents --no-config {env_tmp_dir} - -[testenv:dev] -description = generate a DEV environment -package = editable -commands = - uv pip tree - python -c 'import sys; print(sys.executable)' diff --git a/tox.toml b/tox.toml new file mode 100644 index 0000000..877d2c2 --- /dev/null +++ b/tox.toml @@ -0,0 +1,65 @@ +requires = [ "tox>=4.32", "tox-uv>=1.29" ] +env_list = [ "3.14", "3.13", "3.12", "3.11", "3.14t", "fix", "pkg_meta", "type" ] +skip_missing_interpreters = true + +[env_run_base] +description = "run the unit tests with pytest under {env_name}" +package = "wheel" +wheel_build_env = ".pkg" +extras = [ "testing" ] +pass_env = [ "PYTEST_*" ] +set_env.COVERAGE_FILE = { replace = "env", name = "COVERAGE_FILE", default = "{work_dir}{/}.coverage.{env_name}" } +commands = [ + [ + "python", + "-m", + "pytest", + { replace = "posargs", extend = true, default = [ + "--cov", + "{env_site_packages_dir}{/}sphinx_argparse_cli", + "--cov", + "{tox_root}{/}tests", + "--cov-config=pyproject.toml", + "--no-cov-on-fail", + "--cov-report", + "term-missing:skip-covered", + "--cov-context=test", + "--cov-report", + "html:{env_tmp_dir}{/}htmlcov", + "--cov-report", + "xml:{work_dir}{/}coverage.{env_name}.xml", + "--junitxml", + "{work_dir}{/}junit.{env_name}.xml", + "tests", + ] }, + ], +] + +[env.fix] +description = "format the code base to adhere to our styles, and complain about what we cannot do automatically" +skip_install = true +deps = [ "pre-commit-uv>=4.2" ] +commands = [ [ "pre-commit", "run", "--all-files", "--show-diff-on-failure" ] ] + +[env.pkg_meta] +description = "check that the long description is valid" +skip_install = true +deps = [ "check-wheel-contents>=0.6.3", "twine>=6.2", "uv>=0.9.16" ] +commands = [ + [ "uv", "build", "--sdist", "--wheel", "--out-dir", "{env_tmp_dir}", "." ], + [ "twine", "check", "{env_tmp_dir}{/}*" ], + [ "check-wheel-contents", "--no-config", "{env_tmp_dir}" ], +] + +[env.type] +description = "run type check on code base" +deps = [ "mypy==1.19", "types-docutils>=0.22.3.20251115" ] +commands = [ [ "mypy", "src", "tests", { replace = "posargs", extend = true } ] ] + +[env.dev] +description = "generate a DEV environment" +package = "editable" +commands = [ + [ "uv", "pip", "tree" ], + [ "python", "-c", "import sys; print(sys.executable)" ], +]