Fix reformat/dumps output for PEP 639

Author: domdfcoding

pyproject_parser/__init__.py

@@ -405,7 +405,7 @@ def dumps(
 			if "license" in toml_dict["project"] and toml_dict["project"]["license"] is not None:
 				toml_dict["project"] = {  # type: ignore[typeddict-item]
 					**toml_dict["project"],  # type: ignore[misc,arg-type]
-					"license": toml_dict["project"]["license"].to_pep621_dict()
+					"license": toml_dict["project"]["license"].to_pep639()
 					}
 
 			if "readme" in toml_dict["project"] and toml_dict["project"]["readme"] is not None:

pyproject_parser/classes.py

@@ -37,7 +37,7 @@
 # stdlib
 import pathlib
 from contextlib import suppress
-from typing import TYPE_CHECKING, Any, Dict, Mapping, Optional, Type, TypeVar
+from typing import TYPE_CHECKING, Any, Dict, Mapping, Optional, Type, TypeVar, Union
 
 # 3rd party
 import attr
@@ -346,6 +346,23 @@ def to_pep621_dict(self) -> Dict[str, str]:
 
 		return as_dict
 
+	def to_pep639(self) -> Union[Dict[str, str], str]:
+		"""
+		Construct a dictionary or string representing the :class:`~.License` object,
+		suitable for use in :pep:`639`-compatible ``pyproject.toml`` configuration.
+
+		:rtype:
+
+		.. versionadded:: 0.14.0
+		.. seealso:: :meth:`~.Readme.from_dict`, :meth:`~.License.to_pep621_dict`
+		.. latex:clearpage::
+		"""  # noqa: D400
+
+		if self.expression is not None:
+			return self.expression
+
+		return self.to_pep621_dict()
+
 
 class _NormalisedName(str):
 	"""

tests/test_cli.py

@@ -47,6 +47,10 @@
 				pytest.param(UNORDERED, id="UNORDERED"),
 				pytest.param(COMPLETE_UNDERSCORE_NAME, id="COMPLETE_UNDERSCORE_NAME"),
 				pytest.param(COMPLETE_DEPENDENCY_GROUPS, id="COMPLETE_DEPENDENCY_GROUPS"),
+				pytest.param(
+						f"[project]\nname = 'spam'\nlicense = 'MIT AND (Apache-2.0 OR BSD-2-Clause)'\nversion = '2020.0.0'\n",
+						id="PEP639"
+						),
 				]
 		)
 @pytest.mark.parametrize("show_diff", [True, False])
@@ -84,7 +88,19 @@ def test_reformat(
 	assert result.stdout == "Reformatting 'pyproject.toml'\n"
 
 
-@pytest.mark.parametrize("toml_string", [*valid_pep621_config, *valid_buildsystem_config])
+@pytest.mark.parametrize(
+		"toml_string",
+		[
+				*valid_pep621_config,
+				*valid_buildsystem_config,
+				pytest.param(f"{MINIMAL_CONFIG}\nlicense = 'GPL-3.0-or-later'\n", id="PEP639-GPL"),
+				pytest.param(
+						f"{MINIMAL_CONFIG}\nlicense = 'MIT AND (Apache-2.0 OR BSD-2-Clause)'\n",
+						id="PEP639-AND-OR",
+						),
+				pytest.param(f"{MINIMAL_CONFIG}\nlicense = 'LicenseRef-My-Custom-License'\n", id="PEP639-CUSTOM"),
+				]
+		)
 def test_check(
 		toml_string: str,
 		tmp_pathplus: PathPlus,

tests/test_cli_/test_reformat_False_PEP639_.diff

@@ -0,0 +1 @@
+Reformatting 'pyproject.toml'

tests/test_cli_/test_reformat_False_PEP639_.toml

@@ -0,0 +1,7 @@
+[project]
+name = "spam"
+version = "2020.0.0"
+license = "MIT AND (Apache-2.0 OR BSD-2-Clause)"
+dynamic = []
+
+[tool]

tests/test_cli_/test_reformat_True_PEP639_.diff

@@ -0,0 +1,15 @@
+Reformatting 'pyproject.toml'
+--- pyproject.toml	(original)
++++ pyproject.toml	(reformatted)
+@@ -1,5 +1,8 @@
+ [project]
+-name = 'spam'
+-license = 'MIT AND (Apache-2.0 OR BSD-2-Clause)'
+-version = '2020.0.0'
++name = "spam"
++version = "2020.0.0"
++license = "MIT AND (Apache-2.0 OR BSD-2-Clause)"
++dynamic = []
+
++[tool]
++

tests/test_cli_/test_reformat_True_PEP639_.toml

@@ -0,0 +1,7 @@
+[project]
+name = "spam"
+version = "2020.0.0"
+license = "MIT AND (Apache-2.0 OR BSD-2-Clause)"
+dynamic = []
+
+[tool]