sts-sponsors team mailing list archive

[Alberto Donato <mp+440825@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:add-tox-ini-fmt into maas:master.

Commit message:
add tox-ini-fmt formatter

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/440825
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/tox.ini b/tox.ini
index 3d16143..b89e81d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,3 +1,39 @@
+[tox]
+requires =
+    tox>=4.2
+env_list =
+    format
+    lint
+    oapi
+no_package = true
+
+[testenv:format]
+deps =
+    {[deps]lint}
+commands =
+    setup-cfg-fmt setup.cfg
+    isort {[files]lint}
+    black -q {[files]lint}
+    cog -r --verbosity=1 {[files]cog}
+    - pyproject-fmt pyproject.toml
+    - tox-ini-fmt tox.ini
+
+[testenv:lint]
+deps =
+    {[deps]lint}
+commands =
+    isort --check-only --diff {[files]lint}
+    black --check {[files]lint}
+    flake8 {[files]lint}
+    cog --check --verbosity=1 {[files]cog}
+    pyproject-fmt --check pyproject.toml
+
+[testenv:oapi]
+deps =
+    {[deps]oapi}
+commands =
+    {envpython} utilities/check-oapi openapi.yaml
+
 [files]
 lint =
     package-files/usr/lib/maas/maas-delete-file \
@@ -31,33 +67,6 @@ lint =
     isort == 5.12.0
     pyproject-fmt==0.9.2
     setup-cfg-fmt==2.2.0
+    tox-ini-fmt==1.3.0
 oapi =
     openapi-spec-validator == 0.4.0
-
-[tox]
-minversion = 4
-skipsdist = True
-envlist = format, lint, oapi
-
-[testenv:format]
-deps = {[deps]lint}
-commands =
-    setup-cfg-fmt setup.cfg
-    isort {[files]lint}
-    black -q {[files]lint}
-    cog -r --verbosity=1 {[files]cog}
-    - pyproject-fmt pyproject.toml
-
-[testenv:lint]
-deps = {[deps]lint}
-commands =
-    isort --check-only --diff {[files]lint}
-    black --check {[files]lint}
-    flake8 {[files]lint}
-    cog --check --verbosity=1 {[files]cog}
-    pyproject-fmt --check pyproject.toml
-
-[testenv:oapi]
-deps = {[deps]oapi}
-commands =
-    {envpython} utilities/check-oapi openapi.yaml