From ecccb7d0b1c90a3fdc6318395a8f541d0bf6f7e1 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 8 Oct 2022 09:33:09 -0400 Subject: [PATCH 1/5] chore: switch to hatchling Signed-off-by: Henry Schreiner --- pyproject.toml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 45c6a8aa..69881263 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] -build-backend = "setuptools.build_meta" +build-backend = "hatchling.build" requires = [ - "setuptools>=61", + "hatchling" ] [project] @@ -64,11 +64,6 @@ nox = "nox.__main__:main" tox-to-nox = "nox.tox_to_nox:main" -[tool.setuptools] -zip-safe = false -include-package-data = true -package-data = { "nox" = [ "py.typed" ] } - [tool.isort] profile = "black" From 7caeae8350c625848508d1c36935fd90c8478b1e Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 8 Oct 2022 15:46:01 -0400 Subject: [PATCH 2/5] fix: deactivate extras name normalization --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 69881263..0bf90fc2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,6 +63,10 @@ repository = "https://github.com/wntrblm/nox" nox = "nox.__main__:main" tox-to-nox = "nox.tox_to_nox:main" +# Disable extra name normalization (tox-to-nox) for back-compat. +[tool.hatch] +metadata.allow-ambiguous-features = true + [tool.isort] profile = "black" From e72527a51be40ac2abd42c3272c1c837e47d40cb Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 8 Oct 2022 16:14:35 -0400 Subject: [PATCH 3/5] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0bf90fc2..27343a4f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "hatchling.build" requires = [ - "hatchling" + "hatchling", ] [project] From cfef0bddfadd3b1aa6a57f55283f431b6f59eea3 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 8 Oct 2022 17:07:35 -0400 Subject: [PATCH 4/5] Apply suggestions from code review --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 27343a4f..39391eae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,9 +63,8 @@ repository = "https://github.com/wntrblm/nox" nox = "nox.__main__:main" tox-to-nox = "nox.tox_to_nox:main" -# Disable extra name normalization (tox-to-nox) for back-compat. [tool.hatch] -metadata.allow-ambiguous-features = true +metadata.allow-ambiguous-features = true # disable normalization (tox-to-nox) for back-compat [tool.isort] From b30043fa038e0ed909865391d00ce7083ac8862d Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 23 Nov 2022 12:53:34 -0500 Subject: [PATCH 5/5] style: run pre-commit Signed-off-by: Henry Schreiner --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 39391eae..d6e1de72 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,6 +63,7 @@ repository = "https://github.com/wntrblm/nox" nox = "nox.__main__:main" tox-to-nox = "nox.tox_to_nox:main" + [tool.hatch] metadata.allow-ambiguous-features = true # disable normalization (tox-to-nox) for back-compat