From 0b1ac49432db0656279717d4b449e3076c28dda5 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 11 Dec 2024 15:25:45 -0500 Subject: [PATCH 1/4] Update for PEP 639 --- CHANGELOG.md | 4 ++++ pyproject.toml | 3 +-- src/pyrepo/templates/pyproject.toml.j2 | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a14f4cd..706dc3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ In Development -------------- - Update twine dependency to 6.0 - `pyrepo release`: Allow using `--date` when there are no previous tags +- Templates: + - `pyproject.toml`: + - Use final PEP 639 syntax for `license-files` + - Remove license classifier to comply with PEP 639 v2024.11.29 ----------- diff --git a/pyproject.toml b/pyproject.toml index e9a84e0..ebe6f0c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ description = "Python repository templater & releaser" readme = "README.rst" requires-python = ">=3.10" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "pyrepo@varonathe.org" } ] @@ -31,7 +31,6 @@ classifiers = [ "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Programming Language :: Python :: Implementation :: CPython", - "License :: OSI Approved :: MIT License", "Environment :: Console", "Intended Audience :: Developers", "Topic :: Software Development :: Code Generators", diff --git a/src/pyrepo/templates/pyproject.toml.j2 b/src/pyrepo/templates/pyproject.toml.j2 index 324f6c1..c50e58c 100644 --- a/src/pyrepo/templates/pyproject.toml.j2 +++ b/src/pyrepo/templates/pyproject.toml.j2 @@ -13,7 +13,7 @@ description = "{{short_description}}" readme = "README.rst" requires-python = "{{python_requires}}" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "{{author}}", email = "{{author_email}}" } ] @@ -38,7 +38,6 @@ classifiers = [ {% if supports_pypy %} "Programming Language :: Python :: Implementation :: PyPy", {% endif %} - "License :: OSI Approved :: MIT License", ### {% if has_typing %} "Typing :: Typed", From 579863650af60af7a0de49dcb40d76bd203198f7 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 11 Dec 2024 15:36:06 -0500 Subject: [PATCH 2/4] Migration script --- migrations/0006-pep639.py | 61 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 migrations/0006-pep639.py diff --git a/migrations/0006-pep639.py b/migrations/0006-pep639.py new file mode 100644 index 0000000..fd3b77d --- /dev/null +++ b/migrations/0006-pep639.py @@ -0,0 +1,61 @@ +#!/usr/bin/env pipx run +# /// script +# requires-python = ">=3.9" +# dependencies = [ +# "click ~= 8.0", +# "in-place ~= 1.0", +# ] +# /// + +from __future__ import annotations +import os +from pathlib import Path +import shlex +import subprocess +import sys +from typing import Any +import click +from in_place import InPlace + + +@click.command() +@click.option("--git/--no-git", default=True) +@click.argument( + "dirpath", + type=click.Path(exists=True, file_okay=False, path_type=Path), + default=os.curdir, +) +def main(dirpath: Path, git: bool) -> None: + update_pyproject(dirpath) + if git: + log("Committing ...") + runcmd( + "git", "commit", "-m", "Update for PEP 639", "pyproject.toml", cwd=dirpath + ) + + +def update_pyproject(dirpath: Path) -> None: + log("Updating pyproject.toml ...") + with InPlace(dirpath / "pyproject.toml", encoding="utf-8") as fp: + for line in fp: + if line.startswith("license-files ="): + line = 'license-files = ["LICENSE"]\n' + elif line.strip() == '"License :: OSI Approved :: MIT License",': + continue + print(line, end="", file=fp) + + +def runcmd(*args: str | Path, **kwargs: Any) -> None: + argstrs = [str(a) for a in args] + click.secho("+" + shlex.join(argstrs), err=True, fg="green") + r = subprocess.run(argstrs, **kwargs) + if r.returncode != 0: + sys.exit(r.returncode) + + +def log(msg: str) -> None: + click.secho(msg, err=True, bold=True) + + +if __name__ == "__main__": + main() From efe3c2662b1d34ac874846e4e8eb1e8e6ad5d6f6 Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Wed, 11 Dec 2024 15:39:02 -0500 Subject: [PATCH 3/4] Update test cases --- test/data/pyrepo_init/bothreq-overlap/after/pyproject.toml | 3 +-- test/data/pyrepo_init/bothreq/after/pyproject.toml | 3 +-- test/data/pyrepo_init/coding-comment/after/pyproject.toml | 3 +-- test/data/pyrepo_init/command-flat/after/pyproject.toml | 3 +-- test/data/pyrepo_init/command-noflat-req/after/pyproject.toml | 3 +-- test/data/pyrepo_init/command-noflat/after/pyproject.toml | 3 +-- test/data/pyrepo_init/docs-tests/after/pyproject.toml | 3 +-- test/data/pyrepo_init/docs/after/pyproject.toml | 3 +-- .../data/pyrepo_init/fetch-github-user-ci/after/pyproject.toml | 3 +-- test/data/pyrepo_init/fetch-github-user/after/pyproject.toml | 3 +-- test/data/pyrepo_init/flat-ci/after/pyproject.toml | 3 +-- test/data/pyrepo_init/flat-doctests/after/pyproject.toml | 3 +-- .../pyrepo_init/flat-noreq-pycomment-geq/after/pyproject.toml | 3 +-- .../data/pyrepo_init/flat-noreq-pycomment/after/pyproject.toml | 3 +-- test/data/pyrepo_init/flat-noreq/after/pyproject.toml | 3 +-- test/data/pyrepo_init/flat-req-pycomment/after/pyproject.toml | 3 +-- test/data/pyrepo_init/flat-req/after/pyproject.toml | 3 +-- test/data/pyrepo_init/flat-tests/after/pyproject.toml | 3 +-- test/data/pyrepo_init/flat-typing/after/pyproject.toml | 3 +-- test/data/pyrepo_init/hyphenmix01/after/pyproject.toml | 3 +-- test/data/pyrepo_init/licensed-gap-year/after/pyproject.toml | 3 +-- test/data/pyrepo_init/licensed-new-year/after/pyproject.toml | 3 +-- test/data/pyrepo_init/licensed-old-year/after/pyproject.toml | 3 +-- test/data/pyrepo_init/nonflat-ci/after/pyproject.toml | 3 +-- test/data/pyrepo_init/nonflat-noreq/after/pyproject.toml | 3 +-- test/data/pyrepo_init/nonflat-req/after/pyproject.toml | 3 +-- .../pyrepo_init/nonflat-tests-typing-ci/after/pyproject.toml | 3 +-- .../data/pyrepo_init/nonflat-tests-typing/after/pyproject.toml | 3 +-- test/data/pyrepo_init/nonflat-tests/after/pyproject.toml | 3 +-- test/data/pyrepo_init/nonflat-typing/after/pyproject.toml | 3 +-- test/data/pyrepo_init/pyreq-cfg-req-opt/after/pyproject.toml | 3 +-- test/data/pyrepo_init/pyreq-cfg-req/after/pyproject.toml | 3 +-- test/data/pyrepo_init/pyreq-cfg-src-opt/after/pyproject.toml | 3 +-- test/data/pyrepo_init/pyreq-cfg-src/after/pyproject.toml | 3 +-- test/data/pyrepo_init/pyreq-cfg/after/pyproject.toml | 3 +-- .../pyreq-opt-override-mismatch/after/pyproject.toml | 3 +-- test/data/pyrepo_init/pyreq-req-opt/after/pyproject.toml | 3 +-- test/data/pyrepo_init/pyreq-req-src/after/pyproject.toml | 3 +-- test/data/pyrepo_init/pyreq-src-opt/after/pyproject.toml | 3 +-- .../data/pyrepo_init/python_requires-flat/after/pyproject.toml | 3 +-- .../pyrepo_init/python_requires-noflat/after/pyproject.toml | 3 +-- test/data/pyrepo_init/requires-flat/after/pyproject.toml | 3 +-- test/data/pyrepo_init/requires-noflat/after/pyproject.toml | 3 +-- test/data/pyrepo_init/shebang-coding/after/pyproject.toml | 3 +-- test/data/pyrepo_init/shebang/after/pyproject.toml | 3 +-- test/data/pyrepo_init/src-flat-doctests/after/pyproject.toml | 3 +-- test/data/pyrepo_init/src-flat-tests/after/pyproject.toml | 3 +-- test/data/pyrepo_init/src-nonflat-tests/after/pyproject.toml | 3 +-- test/data/pyrepo_init/template-opts/after/pyproject.toml | 3 +-- 49 files changed, 49 insertions(+), 98 deletions(-) diff --git a/test/data/pyrepo_init/bothreq-overlap/after/pyproject.toml b/test/data/pyrepo_init/bothreq-overlap/after/pyproject.toml index cac7263..5691c3a 100644 --- a/test/data/pyrepo_init/bothreq-overlap/after/pyproject.toml +++ b/test/data/pyrepo_init/bothreq-overlap/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/bothreq/after/pyproject.toml b/test/data/pyrepo_init/bothreq/after/pyproject.toml index cac7263..5691c3a 100644 --- a/test/data/pyrepo_init/bothreq/after/pyproject.toml +++ b/test/data/pyrepo_init/bothreq/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/coding-comment/after/pyproject.toml b/test/data/pyrepo_init/coding-comment/after/pyproject.toml index 3c5afb1..d31d259 100644 --- a/test/data/pyrepo_init/coding-comment/after/pyproject.toml +++ b/test/data/pyrepo_init/coding-comment/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/command-flat/after/pyproject.toml b/test/data/pyrepo_init/command-flat/after/pyproject.toml index 3c5afb1..d31d259 100644 --- a/test/data/pyrepo_init/command-flat/after/pyproject.toml +++ b/test/data/pyrepo_init/command-flat/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/command-noflat-req/after/pyproject.toml b/test/data/pyrepo_init/command-noflat-req/after/pyproject.toml index 2ccb7c8..11c6ed1 100644 --- a/test/data/pyrepo_init/command-noflat-req/after/pyproject.toml +++ b/test/data/pyrepo_init/command-noflat-req/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/command-noflat/after/pyproject.toml b/test/data/pyrepo_init/command-noflat/after/pyproject.toml index bbc611d..bc3b7f2 100644 --- a/test/data/pyrepo_init/command-noflat/after/pyproject.toml +++ b/test/data/pyrepo_init/command-noflat/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/docs-tests/after/pyproject.toml b/test/data/pyrepo_init/docs-tests/after/pyproject.toml index 2b76a3b..5147a1a 100644 --- a/test/data/pyrepo_init/docs-tests/after/pyproject.toml +++ b/test/data/pyrepo_init/docs-tests/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/docs/after/pyproject.toml b/test/data/pyrepo_init/docs/after/pyproject.toml index 2b76a3b..5147a1a 100644 --- a/test/data/pyrepo_init/docs/after/pyproject.toml +++ b/test/data/pyrepo_init/docs/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/fetch-github-user-ci/after/pyproject.toml b/test/data/pyrepo_init/fetch-github-user-ci/after/pyproject.toml index 4cf4814..11ac7c5 100644 --- a/test/data/pyrepo_init/fetch-github-user-ci/after/pyproject.toml +++ b/test/data/pyrepo_init/fetch-github-user-ci/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/fetch-github-user/after/pyproject.toml b/test/data/pyrepo_init/fetch-github-user/after/pyproject.toml index 4cf4814..11ac7c5 100644 --- a/test/data/pyrepo_init/fetch-github-user/after/pyproject.toml +++ b/test/data/pyrepo_init/fetch-github-user/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-ci/after/pyproject.toml b/test/data/pyrepo_init/flat-ci/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/flat-ci/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-ci/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-doctests/after/pyproject.toml b/test/data/pyrepo_init/flat-doctests/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/flat-doctests/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-doctests/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-noreq-pycomment-geq/after/pyproject.toml b/test/data/pyrepo_init/flat-noreq-pycomment-geq/after/pyproject.toml index 6d935c6..153462c 100644 --- a/test/data/pyrepo_init/flat-noreq-pycomment-geq/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-noreq-pycomment-geq/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">= 3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-noreq-pycomment/after/pyproject.toml b/test/data/pyrepo_init/flat-noreq-pycomment/after/pyproject.toml index af4aa87..6da51c8 100644 --- a/test/data/pyrepo_init/flat-noreq-pycomment/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-noreq-pycomment/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-noreq/after/pyproject.toml b/test/data/pyrepo_init/flat-noreq/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/flat-noreq/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-noreq/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-req-pycomment/after/pyproject.toml b/test/data/pyrepo_init/flat-req-pycomment/after/pyproject.toml index 5d9f108..a579aa8 100644 --- a/test/data/pyrepo_init/flat-req-pycomment/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-req-pycomment/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-req/after/pyproject.toml b/test/data/pyrepo_init/flat-req/after/pyproject.toml index 71a63a7..d4ceb6f 100644 --- a/test/data/pyrepo_init/flat-req/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-req/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-tests/after/pyproject.toml b/test/data/pyrepo_init/flat-tests/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/flat-tests/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-tests/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/flat-typing/after/pyproject.toml b/test/data/pyrepo_init/flat-typing/after/pyproject.toml index 1e7d1d2..5abcedb 100644 --- a/test/data/pyrepo_init/flat-typing/after/pyproject.toml +++ b/test/data/pyrepo_init/flat-typing/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### "Typing :: Typed", ] diff --git a/test/data/pyrepo_init/hyphenmix01/after/pyproject.toml b/test/data/pyrepo_init/hyphenmix01/after/pyproject.toml index d05c5e0..5605978 100644 --- a/test/data/pyrepo_init/hyphenmix01/after/pyproject.toml +++ b/test/data/pyrepo_init/hyphenmix01/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foo-bar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/licensed-gap-year/after/pyproject.toml b/test/data/pyrepo_init/licensed-gap-year/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/licensed-gap-year/after/pyproject.toml +++ b/test/data/pyrepo_init/licensed-gap-year/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/licensed-new-year/after/pyproject.toml b/test/data/pyrepo_init/licensed-new-year/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/licensed-new-year/after/pyproject.toml +++ b/test/data/pyrepo_init/licensed-new-year/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/licensed-old-year/after/pyproject.toml b/test/data/pyrepo_init/licensed-old-year/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/licensed-old-year/after/pyproject.toml +++ b/test/data/pyrepo_init/licensed-old-year/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/nonflat-ci/after/pyproject.toml b/test/data/pyrepo_init/nonflat-ci/after/pyproject.toml index 19c2f4f..8c27be7 100644 --- a/test/data/pyrepo_init/nonflat-ci/after/pyproject.toml +++ b/test/data/pyrepo_init/nonflat-ci/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/nonflat-noreq/after/pyproject.toml b/test/data/pyrepo_init/nonflat-noreq/after/pyproject.toml index 19c2f4f..8c27be7 100644 --- a/test/data/pyrepo_init/nonflat-noreq/after/pyproject.toml +++ b/test/data/pyrepo_init/nonflat-noreq/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/nonflat-req/after/pyproject.toml b/test/data/pyrepo_init/nonflat-req/after/pyproject.toml index a0db50e..50aeb99 100644 --- a/test/data/pyrepo_init/nonflat-req/after/pyproject.toml +++ b/test/data/pyrepo_init/nonflat-req/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/nonflat-tests-typing-ci/after/pyproject.toml b/test/data/pyrepo_init/nonflat-tests-typing-ci/after/pyproject.toml index 1e7d1d2..5abcedb 100644 --- a/test/data/pyrepo_init/nonflat-tests-typing-ci/after/pyproject.toml +++ b/test/data/pyrepo_init/nonflat-tests-typing-ci/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### "Typing :: Typed", ] diff --git a/test/data/pyrepo_init/nonflat-tests-typing/after/pyproject.toml b/test/data/pyrepo_init/nonflat-tests-typing/after/pyproject.toml index 1e7d1d2..5abcedb 100644 --- a/test/data/pyrepo_init/nonflat-tests-typing/after/pyproject.toml +++ b/test/data/pyrepo_init/nonflat-tests-typing/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### "Typing :: Typed", ] diff --git a/test/data/pyrepo_init/nonflat-tests/after/pyproject.toml b/test/data/pyrepo_init/nonflat-tests/after/pyproject.toml index 19c2f4f..8c27be7 100644 --- a/test/data/pyrepo_init/nonflat-tests/after/pyproject.toml +++ b/test/data/pyrepo_init/nonflat-tests/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/nonflat-typing/after/pyproject.toml b/test/data/pyrepo_init/nonflat-typing/after/pyproject.toml index 1e7d1d2..5abcedb 100644 --- a/test/data/pyrepo_init/nonflat-typing/after/pyproject.toml +++ b/test/data/pyrepo_init/nonflat-typing/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### "Typing :: Typed", ] diff --git a/test/data/pyrepo_init/pyreq-cfg-req-opt/after/pyproject.toml b/test/data/pyrepo_init/pyreq-cfg-req-opt/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/pyreq-cfg-req-opt/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-cfg-req-opt/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/pyreq-cfg-req/after/pyproject.toml b/test/data/pyrepo_init/pyreq-cfg-req/after/pyproject.toml index 85f9f0e..0a856df 100644 --- a/test/data/pyrepo_init/pyreq-cfg-req/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-cfg-req/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.7" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -25,7 +25,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/pyreq-cfg-src-opt/after/pyproject.toml b/test/data/pyrepo_init/pyreq-cfg-src-opt/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/pyreq-cfg-src-opt/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-cfg-src-opt/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/pyreq-cfg-src/after/pyproject.toml b/test/data/pyrepo_init/pyreq-cfg-src/after/pyproject.toml index 85f9f0e..0a856df 100644 --- a/test/data/pyrepo_init/pyreq-cfg-src/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-cfg-src/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.7" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -25,7 +25,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/pyreq-cfg/after/pyproject.toml b/test/data/pyrepo_init/pyreq-cfg/after/pyproject.toml index af4aa87..6da51c8 100644 --- a/test/data/pyrepo_init/pyreq-cfg/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-cfg/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/pyreq-opt-override-mismatch/after/pyproject.toml b/test/data/pyrepo_init/pyreq-opt-override-mismatch/after/pyproject.toml index af4aa87..6da51c8 100644 --- a/test/data/pyrepo_init/pyreq-opt-override-mismatch/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-opt-override-mismatch/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/pyreq-req-opt/after/pyproject.toml b/test/data/pyrepo_init/pyreq-req-opt/after/pyproject.toml index 0cb5465..dbc3fb2 100644 --- a/test/data/pyrepo_init/pyreq-req-opt/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-req-opt/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/pyreq-req-src/after/pyproject.toml b/test/data/pyrepo_init/pyreq-req-src/after/pyproject.toml index af4aa87..6da51c8 100644 --- a/test/data/pyrepo_init/pyreq-req-src/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-req-src/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/pyreq-src-opt/after/pyproject.toml b/test/data/pyrepo_init/pyreq-src-opt/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/pyreq-src-opt/after/pyproject.toml +++ b/test/data/pyrepo_init/pyreq-src-opt/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/python_requires-flat/after/pyproject.toml b/test/data/pyrepo_init/python_requires-flat/after/pyproject.toml index af4aa87..6da51c8 100644 --- a/test/data/pyrepo_init/python_requires-flat/after/pyproject.toml +++ b/test/data/pyrepo_init/python_requires-flat/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/python_requires-noflat/after/pyproject.toml b/test/data/pyrepo_init/python_requires-noflat/after/pyproject.toml index e048b5d..2cadf00 100644 --- a/test/data/pyrepo_init/python_requires-noflat/after/pyproject.toml +++ b/test/data/pyrepo_init/python_requires-noflat/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = "~= 3.6" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -26,7 +26,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/requires-flat/after/pyproject.toml b/test/data/pyrepo_init/requires-flat/after/pyproject.toml index 71a63a7..d4ceb6f 100644 --- a/test/data/pyrepo_init/requires-flat/after/pyproject.toml +++ b/test/data/pyrepo_init/requires-flat/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/requires-noflat/after/pyproject.toml b/test/data/pyrepo_init/requires-noflat/after/pyproject.toml index a0db50e..50aeb99 100644 --- a/test/data/pyrepo_init/requires-noflat/after/pyproject.toml +++ b/test/data/pyrepo_init/requires-noflat/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/shebang-coding/after/pyproject.toml b/test/data/pyrepo_init/shebang-coding/after/pyproject.toml index 3c5afb1..d31d259 100644 --- a/test/data/pyrepo_init/shebang-coding/after/pyproject.toml +++ b/test/data/pyrepo_init/shebang-coding/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/shebang/after/pyproject.toml b/test/data/pyrepo_init/shebang/after/pyproject.toml index 3c5afb1..d31d259 100644 --- a/test/data/pyrepo_init/shebang/after/pyproject.toml +++ b/test/data/pyrepo_init/shebang/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/src-flat-doctests/after/pyproject.toml b/test/data/pyrepo_init/src-flat-doctests/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/src-flat-doctests/after/pyproject.toml +++ b/test/data/pyrepo_init/src-flat-doctests/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/src-flat-tests/after/pyproject.toml b/test/data/pyrepo_init/src-flat-tests/after/pyproject.toml index 22c874b..003cd0d 100644 --- a/test/data/pyrepo_init/src-flat-tests/after/pyproject.toml +++ b/test/data/pyrepo_init/src-flat-tests/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/src-nonflat-tests/after/pyproject.toml b/test/data/pyrepo_init/src-nonflat-tests/after/pyproject.toml index 19c2f4f..8c27be7 100644 --- a/test/data/pyrepo_init/src-nonflat-tests/after/pyproject.toml +++ b/test/data/pyrepo_init/src-nonflat-tests/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar@varonathe.org" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] diff --git a/test/data/pyrepo_init/template-opts/after/pyproject.toml b/test/data/pyrepo_init/template-opts/after/pyproject.toml index 3548231..19d742c 100644 --- a/test/data/pyrepo_init/template-opts/after/pyproject.toml +++ b/test/data/pyrepo_init/template-opts/after/pyproject.toml @@ -9,7 +9,7 @@ description = "A project" readme = "README.rst" requires-python = ">=3.5" license = "MIT" -license-files = { paths = ["LICENSE"] } +license-files = ["LICENSE"] authors = [ { name = "John Thorvald Wodder II", email = "foobar-project-name@example.com" } ] @@ -27,7 +27,6 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", - "License :: OSI Approved :: MIT License", ### ] From b74041aa824a2ce1bfbf1732850d8fcf6036554e Mon Sep 17 00:00:00 2001 From: "John T. Wodder II" Date: Thu, 23 Jan 2025 08:51:56 -0500 Subject: [PATCH 4/4] Update twine and packaging dependencies --- CHANGELOG.md | 2 +- pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 706dc3d..31129e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ In Development -------------- -- Update twine dependency to 6.0 +- Update twine dependency to 6.1 - `pyrepo release`: Allow using `--date` when there are no previous tags - Templates: - `pyproject.toml`: diff --git a/pyproject.toml b/pyproject.toml index ebe6f0c..a703326 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,12 +55,12 @@ dependencies = [ "Jinja2 ~= 3.0", "lineinfile ~= 0.1", "linesep ~= 0.3", - "packaging >= 17.1", + "packaging >= 24.2", "pynacl ~= 1.4", "pyversion-info ~= 1.0", "ruamel.yaml >= 0.15, < 1.0", "tomli >= 1.2, < 3.0; python_version < '3.11'", - "twine ~= 6.0", + "twine ~= 6.1", "uritemplate ~= 4.1", # Running `python -m hatch ...` for inspection purposes seems to cause # Hatch to use the current environment rather than one of its managed