Update pyproject.toml metadata for setuptools

Author: domdfcoding

repo_helper/files/packaging.py

@@ -152,6 +152,8 @@ def make_pyproject(repo_path: pathlib.Path, templates: Environment) -> List[str]
 		data = DefaultDict()
 
 	data.set_default("build-system", {})
+	data.set_default("tool", {})
+
 	build_backend = "setuptools.build_meta"
 
 	build_requirements_ = {
@@ -198,39 +200,56 @@ def make_pyproject(repo_path: pathlib.Path, templates: Environment) -> List[str]
 	data["project"]["license"] = {"file": "LICENSE"}
 
 	if templates.globals["requires_python"] is not None:
-		data["project"]["dynamic"].pop(0)
+		data["project"]["dynamic"].remove("requires-python")
 		data["project"]["requires-python"] = f">={templates.globals['requires_python']}"
-
-	url = "https://github.com/{username}/{repo_name}".format_map(templates.globals)
-	data["project"]["urls"] = {
-			"Homepage": url,
-			"Issue Tracker": "https://github.com/{username}/{repo_name}/issues".format_map(templates.globals),
-			"Source Code": url,
-			}
-
-	if templates.globals["enable_docs"]:
-		data["project"]["urls"]["Documentation"] = templates.globals["docs_url"]
-
-	if templates.globals["use_flit"]:
-		data["project"]["dynamic"] = []
-
+	elif not templates.globals["use_whey"]:
 		if templates.globals["requires_python"] is None:
 			if templates.globals["min_py_version"] in {"3.6", 3.6}:
 				requires_python = "3.6.1"
 			else:
 				requires_python = templates.globals["min_py_version"]
 		else:
 			requires_python = templates.globals["requires_python"]
+		if "requires-python" in data["project"]["dynamic"]:
+			data["project"]["dynamic"].remove("requires-python")
 
 		data["project"]["requires-python"] = f">={requires_python}"
+	elif "requires-python" in data["project"]:
+		del data["project"]["requires-python"]
+
+	if not templates.globals["use_whey"]:
+		data["project"]["dynamic"] = []
 		data["project"]["classifiers"] = _get_classifiers(templates.globals)
-		parsed_requirements, comments, invalid_lines = read_requirements(repo_path / "requirements.txt", include_invalid=True)
-		if invalid_lines:
-			raise NotImplementedError(f"Unsupported requirement type(s): {invalid_lines}")
-		data["project"]["dependencies"] = sorted(parsed_requirements)
 
-	# extras-require
+		if templates.globals["use_flit"]:
+			parsed_requirements, comments, invalid_lines = read_requirements(repo_path / "requirements.txt", include_invalid=True)
+			if invalid_lines:
+				raise NotImplementedError(f"Unsupported requirement type(s): {invalid_lines}")
+			data["project"]["dependencies"] = sorted(parsed_requirements)
+		else:
+			# TODO: currently broken by setuptools; have to omit for it to work
+			# data["project"]["dynamic"].append("dependencies")
+
+			data["tool"].setdefault("setuptools", {})
+			data["tool"]["setuptools"]["zip-safe"] = False
+			data["tool"]["setuptools"]["include-package-data"] = True
+			data["tool"]["setuptools"]["platforms"] = [
+					"Windows",
+					"macOS",
+					"Linux",
+					]
+
+	url = "https://github.com/{username}/{repo_name}".format_map(templates.globals)
+	data["project"]["urls"] = {
+			"Homepage": url,
+			"Issue Tracker": "https://github.com/{username}/{repo_name}/issues".format_map(templates.globals),
+			"Source Code": url,
+			}
+
+	if templates.globals["enable_docs"]:
+		data["project"]["urls"]["Documentation"] = templates.globals["docs_url"]
 
+	# extras-require
 	data["project"]["optional-dependencies"] = {}
 
 	for extra, dependencies in templates.globals["extras_require"].items():
@@ -253,7 +272,6 @@ def make_pyproject(repo_path: pathlib.Path, templates: Environment) -> List[str]
 		del data["project"]["entry-points"]
 
 	# tool
-	data.set_default("tool", {})
 
 	# tool.mkrecipe
 	if templates.globals["enable_conda"]:
@@ -311,6 +329,8 @@ def make_pyproject(repo_path: pathlib.Path, templates: Environment) -> List[str]
 					# templates.globals["source_dir"],
 					templates.globals["import_name"].split('.', 1)[0],
 					)
+	elif "package" in data["tool"]["whey"]:
+		del data["tool"]["whey"]["package"]
 
 	if templates.globals["manifest_additional"]:
 		data["tool"]["whey"]["additional-files"] = templates.globals["manifest_additional"]

tests/test_files/test_packaging_/test_make_pyproject_docs_no_tests_backend_setuptools_.toml

@@ -8,7 +8,17 @@ version = "2020.1.1"
 description = "a short description"
 readme = "README.rst"
 keywords = [ "awesome", "project", "python",]
-dynamic = [ "requires-python", "classifiers", "dependencies",]
+dynamic = []
+requires-python = ">=3.6.1"
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: Microsoft :: Windows",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: Implementation :: CPython",
+]
 
 [[project.authors]]
 name = "E. Xample"
@@ -24,6 +34,11 @@ Homepage = "https://github.com/octocat/hello-world"
 "Source Code" = "https://github.com/octocat/hello-world"
 Documentation = "https://hello-world.readthedocs.io/en/latest"
 
+[tool.setuptools]
+zip-safe = false
+include-package-data = true
+platforms = [ "Windows", "macOS", "Linux",]
+
 [tool.mkrecipe]
 conda-channels = []
 extras = "none"

tests/test_files/test_packaging_/test_make_pyproject_docs_tests_backend_setuptools_.toml

@@ -8,7 +8,17 @@ version = "2020.1.1"
 description = "a short description"
 readme = "README.rst"
 keywords = [ "awesome", "project", "python",]
-dynamic = [ "requires-python", "classifiers", "dependencies",]
+dynamic = []
+requires-python = ">=3.6.1"
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: Microsoft :: Windows",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: Implementation :: CPython",
+]
 
 [[project.authors]]
 name = "E. Xample"
@@ -24,6 +34,11 @@ Homepage = "https://github.com/octocat/hello-world"
 "Source Code" = "https://github.com/octocat/hello-world"
 Documentation = "https://hello-world.readthedocs.io/en/latest"
 
+[tool.setuptools]
+zip-safe = false
+include-package-data = true
+platforms = [ "Windows", "macOS", "Linux",]
+
 [tool.mkrecipe]
 conda-channels = []
 extras = "none"

tests/test_files/test_packaging_/test_make_pyproject_no_docs_no_tests_backend_setuptools_.toml

@@ -8,7 +8,17 @@ version = "2020.1.1"
 description = "a short description"
 readme = "README.rst"
 keywords = [ "awesome", "project", "python",]
-dynamic = [ "requires-python", "classifiers", "dependencies",]
+dynamic = []
+requires-python = ">=3.6.1"
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: Microsoft :: Windows",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: Implementation :: CPython",
+]
 
 [[project.authors]]
 name = "E. Xample"
@@ -23,6 +33,11 @@ Homepage = "https://github.com/octocat/hello-world"
 "Issue Tracker" = "https://github.com/octocat/hello-world/issues"
 "Source Code" = "https://github.com/octocat/hello-world"
 
+[tool.setuptools]
+zip-safe = false
+include-package-data = true
+platforms = [ "Windows", "macOS", "Linux",]
+
 [tool.mkrecipe]
 conda-channels = []
 extras = "none"

tests/test_files/test_packaging_/test_make_pyproject_no_docs_tests_backend_setuptools_.toml

@@ -8,7 +8,17 @@ version = "2020.1.1"
 description = "a short description"
 readme = "README.rst"
 keywords = [ "awesome", "project", "python",]
-dynamic = [ "requires-python", "classifiers", "dependencies",]
+dynamic = []
+requires-python = ">=3.6.1"
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: Microsoft :: Windows",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: Implementation :: CPython",
+]
 
 [[project.authors]]
 name = "E. Xample"
@@ -23,6 +33,11 @@ Homepage = "https://github.com/octocat/hello-world"
 "Issue Tracker" = "https://github.com/octocat/hello-world/issues"
 "Source Code" = "https://github.com/octocat/hello-world"
 
+[tool.setuptools]
+zip-safe = false
+include-package-data = true
+platforms = [ "Windows", "macOS", "Linux",]
+
 [tool.mkrecipe]
 conda-channels = []
 extras = "none"