sts-sponsors team mailing list archive

[Alberto Donato <mp+439620@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:upgrade-tox into maas:master.

Commit message:
bump tox version to 4, extract config to tox.ini

This also moves flake8 config to pyproject.toml



Requested reviews:
  MAAS Maintainers (maas-maintainers)

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

diff --git a/pyproject.toml b/pyproject.toml
index 1748cdd..d6de9a2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,8 @@
 [build-system]
-# With setuptools 50.0.0, 'make .ve' fails.
-requires = ["setuptools < 50.0.0", "wheel"]
 build-backend = "setuptools.build_meta"
+requires = [
+  "setuptools",
+]
 
 [tool.black]
 line-length = 79
@@ -34,6 +35,12 @@ snippets
 """
 order_by_type = false
 
+[tool.flake8]
+ignore = ["E203", "E266", "E501", "W503", "W504"]
+exclude = [
+  "src/*/migrations/*",
+]
+
 [tool.pytest.ini_options]
 filterwarnings = "error::BytesWarning"
 testpaths = [
diff --git a/setup.cfg b/setup.cfg
index c4759cb..0cd6143 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -82,63 +82,3 @@ pytest11 =
     scripts/maas-test-enlistment
     scripts/maas-write-file
     scripts/unverified-ssh
-
-[globals]
-lint_files =
-    setup.py
-    src/apiclient
-    src/maascli
-    src/maasperf
-    src/maasserver
-    src/maastesting
-    src/metadataserver
-    src/provisioningserver
-    src/provisioningserver/refresh/50-maas-01-commissioning
-    utilities/bin2python.py
-    utilities/check-imports
-    utilities/check-oapi
-    utilities/import-db-dump
-    utilities/python_standard_libs.py
-    utilities/snap-bind-mounts
-cog_files =
-    src/maastesting/pytest.dirs
-    pyproject.toml
-deps_lint =
-    black == 23.1.0
-    flake8 == 6.0.0
-    isort == 5.12.0
-    cogapp == 3.3.0
-    click == 8.1.3
-    setup-cfg-fmt==2.2.0
-deps_oapi =
-    openapi-spec-validator == 0.4.0
-
-[flake8]
-ignore = E203, E266, E501, W503, W504
-exclude =
-    src/*/migrations/*
-
-[tox:tox]
-skipsdist = True
-envlist = format,lint,oapi
-
-[testenv:format]
-deps = {[globals]deps_lint}
-commands =
-    setup-cfg-fmt setup.cfg
-    isort {[globals]lint_files}
-    black -q {[globals]lint_files}
-    cog -r --verbosity=1 {[globals]cog_files}
-
-[testenv:lint]
-deps = {[globals]deps_lint}
-commands =
-    isort --check-only --diff {[globals]lint_files}
-    black --check {[globals]lint_files}
-    flake8 {[globals]lint_files}
-    cog --check --verbosity=1 {[globals]cog_files}
-
-[testenv:oapi]
-deps = {[globals]deps_oapi}
-commands =
-    {envpython} utilities/check-oapi openapi.yaml
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..dd8df20
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,58 @@
+[files]
+lint =
+    setup.py \
+    src/apiclient \
+    src/maascli \
+    src/maasperf \
+    src/maasserver \
+    src/maastesting \
+    src/metadataserver \
+    src/provisioningserver \
+    src/provisioningserver/refresh/50-maas-01-commissioning \
+    utilities/bin2python.py \
+    utilities/check-imports \
+    utilities/check-oapi \
+    utilities/import-db-dump \
+    utilities/python_standard_libs.py \
+    utilities/snap-bind-mounts
+cog =
+    src/maastesting/pytest.dirs \
+    pyproject.toml
+
+[deps]
+lint =
+    black == 23.1.0
+    flake8 == 6.0.0
+    flake8-pyproject == 1.2.3
+    isort == 5.12.0
+    cogapp == 3.3.0
+    click == 8.1.3
+    setup-cfg-fmt==2.2.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}
+
+[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}
+
+[testenv:oapi]
+deps = {[deps]oapi}
+commands =
+    {envpython} utilities/check-oapi openapi.yaml