Skip to content

Commit

Permalink
Move project.license above project.authors consistently
Browse files Browse the repository at this point in the history
  • Loading branch information
@domdfcoding
domdfcoding committed May 2, 2024
1 parent fee5cc5 commit 0ce21c2
Show file tree
Hide file tree
Showing 23 changed files with 68 additions and 68 deletions.
4 changes: 2 additions & 2 deletions repo_helper/files/packaging.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def make_pyproject(repo_path: pathlib.Path, templates: Environment) -> List[str]
data["build-system"]["requires"] = list(map(str, build_requirements))
data["build-system"]["build-backend"] = build_backend

data["project"] = DefaultDict(data.get("project", {}))
data["project"] = {}
data["project"]["name"] = templates.globals["pypi_name"]
data["project"]["version"] = templates.globals["version"]
data["project"]["description"] = templates.globals["short_desc"]
Expand Down Expand Up @@ -244,8 +244,8 @@ def make_pyproject(repo_path: pathlib.Path, templates: Environment) -> List[str]
del data["project"]["classifiers"]

data["project"]["dynamic"] = dynamic
data["project"]["authors"] = [{"name": templates.globals["author"], "email": templates.globals["email"]}]
data["project"]["license"] = {"file": "LICENSE"}
data["project"]["authors"] = [{"name": templates.globals["author"], "email": templates.globals["email"]}]

_enabled_backends = get_keys(templates.globals, "use_flit", "use_maturin", "use_hatch")
if not any(_enabled_backends) and "dependencies" in data["project"]:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_no_tests_backend_flit_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
dynamic = []
dependencies = [ "domdf-python-tools>=2.8.0", "toml>=0.10.2",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_no_tests_backend_hatch_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_no_tests_backend_maturin_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
dynamic = []
dependencies = [ "domdf-python-tools>=2.8.0", "toml>=0.10.2",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_no_tests_backend_setuptools_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_no_tests_backend_whey_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ readme = "README.rst"
keywords = [ "awesome", "project", "python",]
dynamic = [ "requires-python", "classifiers", "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_tests_backend_flit_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
dynamic = []
dependencies = [ "domdf-python-tools>=2.8.0", "toml>=0.10.2",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_tests_backend_hatch_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_tests_backend_maturin_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
dynamic = []
dependencies = [ "domdf-python-tools>=2.8.0", "toml>=0.10.2",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_tests_backend_setuptools_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_docs_tests_backend_whey_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ readme = "README.rst"
keywords = [ "awesome", "project", "python",]
dynamic = [ "requires-python", "classifiers", "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_no_tests_backend_flit_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
dynamic = []
dependencies = [ "domdf-python-tools>=2.8.0", "toml>=0.10.2",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_no_tests_backend_hatch_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_no_tests_backend_maturin_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
dynamic = []
dependencies = [ "domdf-python-tools>=2.8.0", "toml>=0.10.2",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions .../test_files/test_packaging_/test_make_pyproject_no_docs_no_tests_backend_setuptools_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_no_tests_backend_whey_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ readme = "README.rst"
keywords = [ "awesome", "project", "python",]
dynamic = [ "requires-python", "classifiers", "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_tests_backend_flit_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
dynamic = []
dependencies = [ "domdf-python-tools>=2.8.0", "toml>=0.10.2",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_tests_backend_hatch_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_tests_backend_maturin_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
dynamic = []
dependencies = [ "domdf-python-tools>=2.8.0", "toml>=0.10.2",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_tests_backend_setuptools_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ classifiers = [
]
dynamic = [ "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_no_docs_tests_backend_whey_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ readme = "README.rst"
keywords = [ "awesome", "project", "python",]
dynamic = [ "requires-python", "classifiers", "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_whey_extras_no_tests_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ requires-python = ">=3.6.1"
keywords = [ "awesome", "project", "python",]
dynamic = [ "classifiers", "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down
6 changes: 3 additions & 3 deletions tests/test_files/test_packaging_/test_make_pyproject_whey_extras_tests_.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ requires-python = ">=3.6.1"
keywords = [ "awesome", "project", "python",]
dynamic = [ "classifiers", "dependencies",]

[project.license]
file = "LICENSE"

[[project.authors]]
name = "E. Xample"
email = "j.bloggs@example.com"

[project.license]
file = "LICENSE"

[project.urls]
Homepage = "https://github.com/octocat/hello-world"
"Issue Tracker" = "https://github.com/octocat/hello-world/issues"
Expand Down

0 comments on commit 0ce21c2

Please sign in to comment.