Update init & new commands for PEP 639 (License)

src/poetry/layouts/layout.py

@@ -32,7 +32,7 @@
 description = ""
 authors = [
 ]
-license = {}
+license = ""
 readme = ""
 requires-python = ""
 dependencies = [
@@ -158,7 +158,7 @@ def generate_project_content(
             project_content["authors"].append(author)
 
         if self._license:
-            project_content["license"]["text"] = self._license
+            project_content["license"] = self._license
         else:
             project_content.remove("license")
 

tests/console/commands/conftest.py

@@ -30,7 +30,7 @@ def init_basic_toml() -> str:
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 readme = "README.md"
 requires-python = ">=3.6"
 """
@@ -55,7 +55,7 @@ def new_basic_toml() -> str:
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 readme = "README.md"
 requires-python = ">=3.6"
 dependencies = [

tests/console/commands/test_init.py

@@ -145,7 +145,7 @@ def test_interactive_with_dependencies(
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "pendulum (>=2.0.0,<3.0.0)",
@@ -201,7 +201,7 @@ def test_interactive_with_dependencies_and_no_selection(
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 """
 
@@ -269,7 +269,7 @@ def test_interactive_with_git_dependencies(
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "demo @ git+https://github.com/demo/demo.git"
@@ -364,7 +364,7 @@ def test_interactive_with_git_dependencies_with_reference(
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "demo @ git+https://github.com/demo/demo.git@develop"
@@ -412,7 +412,7 @@ def test_interactive_with_git_dependencies_and_other_name(
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "demo @ git+https://github.com/demo/pyproject-demo.git"
@@ -467,7 +467,7 @@ def test_interactive_with_directory_dependency(
 authors = [
     {{name = "Your Name",email = "[email protected]"}}
 ]
-license = {{text = "MIT"}}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "demo @ {demo_uri}"
@@ -521,7 +521,7 @@ def test_interactive_with_directory_dependency_and_other_name(
 authors = [
     {{name = "Your Name",email = "[email protected]"}}
 ]
-license = {{text = "MIT"}}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "demo @ {demo_uri}"
@@ -576,7 +576,7 @@ def test_interactive_with_file_dependency(
 authors = [
     {{name = "Your Name",email = "[email protected]"}}
 ]
-license = {{text = "MIT"}}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "demo @ {demo_uri}"
@@ -623,7 +623,7 @@ def test_interactive_with_wrong_dependency_inputs(
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.8"
 dependencies = [
     "foo (==1.19.2)",
@@ -660,7 +660,7 @@ def test_python_option(tester: CommandTester) -> None:
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 """
 
@@ -691,7 +691,7 @@ def test_predefined_dependency(tester: CommandTester, repo: TestRepository) -> N
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "pendulum (>=2.0.0,<3.0.0)"
@@ -733,7 +733,7 @@ def test_predefined_and_interactive_dependencies(
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
     "pendulum (>=2.0.0,<3.0.0)",
@@ -768,7 +768,7 @@ def test_predefined_dev_dependency(tester: CommandTester, repo: TestRepository)
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
 ]
@@ -814,7 +814,7 @@ def test_predefined_and_interactive_dev_dependencies(
 authors = [
     {name = "Your Name",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.6"
 dependencies = [
 ]
@@ -861,7 +861,7 @@ def test_predefined_all_options(tester: CommandTester, repo: TestRepository) ->
 authors = [
     {name = "Foo Bar",email = "[email protected]"}
 ]
-license = {text = "MIT"}
+license = "MIT"
 requires-python = ">=3.8"
 dependencies = [
     "pendulum (>=2.0.0,<3.0.0)"