add support for PEP 621): parse new fields (python-poetry#708)

- introduce schema for [project] section
- soften schema for [tool.poetry] section so that there are no mandatory fields
- deprecate fields in [tool.poetry] that can be completely replaced by fields in [project]
- add possibility to add supplementary dependency information in [tool.poetry.dependencies]
- add warnings for deprecated and duplicated fields in Factory.validate()

Co-authored-by: Sébastien Eustace <[email protected]>

Author: radoering

src/poetry/core/factory.py

@@ -3,28 +3,6 @@
   "name": "Package",
   "type": "object",
   "additionalProperties": true,
-  "anyOf": [
-    {
-      "required": [
-        "package-mode"
-      ],
-      "properties": {
-        "package-mode": {
-          "enum": [
-            false
-          ]
-        }
-      }
-    },
-    {
-      "required": [
-        "name",
-        "version",
-        "description",
-        "authors"
-      ]
-    }
-  ],
   "properties": {
     "package-mode": {
       "type": "boolean",
@@ -33,54 +11,56 @@
     },
     "name": {
       "type": "string",
-      "description": "Package name."
+      "description": "Package name (legacy)."
     },
     "version": {
       "type": "string",
-      "description": "Package version."
+      "description": "Package version (legacy)."
     },
     "description": {
       "type": "string",
-      "description": "Short package description.",
+      "description": "Short package description (legacy).",
       "pattern": "\\A[^\\n]*\\Z"
     },
     "keywords": {
       "type": "array",
       "items": {
         "type": "string",
-        "description": "A tag/keyword that this package relates to."
+        "description": "A tag/keyword that this package relates to (legacy)."
       }
     },
     "homepage": {
       "type": "string",
-      "description": "Homepage URL for the project.",
+      "description": "Homepage URL for the project (legacy).",
       "format": "uri"
     },
     "repository": {
       "type": "string",
-      "description": "Repository URL for the project.",
+      "description": "Repository URL for the project (legacy).",
       "format": "uri"
     },
     "documentation": {
       "type": "string",
-      "description": "Documentation URL for the project.",
+      "description": "Documentation URL for the project (legacy).",
       "format": "uri"
     },
     "license": {
       "type": "string",
-      "description": "License name."
+      "description": "License name (legacy)."
     },
     "authors": {
-      "$ref": "#/definitions/authors"
+      "$ref": "#/definitions/authors",
+      "description": "Authors (legacy)."
     },
     "maintainers": {
-      "$ref": "#/definitions/maintainers"
+      "$ref": "#/definitions/maintainers",
+      "description": "Maintainers (legacy)."
     },
     "readme": {
       "anyOf": [
         {
           "type": "string",
-          "description": "The path to the README file."
+          "description": "The path to the README file (legacy)."
         },
         {
           "type": "array",
@@ -93,7 +73,7 @@
     },
     "classifiers": {
       "type": "array",
-      "description": "A list of trove classifiers."
+      "description": "A list of trove classifiers (legacy)."
     },
     "packages": {
       "type": "array",
@@ -156,9 +136,6 @@
     "dependencies": {
       "type": "object",
       "description": "This is a hash of package name (keys) and version constraints (values) that are required to run this package.",
-      "required": [
-        "python"
-      ],
       "properties": {
         "python": {
           "type": "string",
@@ -176,6 +153,7 @@
     },
     "extras": {
       "type": "object",
+      "description": "Extras (legacy).",
       "patternProperties": {
         "^[a-zA-Z-_.0-9]+$": {
           "type": "array",
@@ -250,22 +228,22 @@
       "patternProperties": {
         "^.+$": {
           "type": "string",
-          "description": "The full url of the custom url."
+          "description": "The full url of the custom url (Legacy)."
         }
       }
     }
   },
   "definitions": {
     "authors": {
       "type": "array",
-      "description": "List of authors that contributed to the package. This is typically the main maintainers, not the full list.",
+      "description": "List of authors that contributed to the package. This is typically the main maintainers, not the full list (legacy).",
       "items": {
         "type": "string"
       }
     },
     "maintainers": {
       "type": "array",
-      "description": "List of maintainers, other than the original author(s), that upkeep the package.",
+      "description": "List of maintainers, other than the original author(s), that upkeep the package (legacy).",
       "items": {
         "type": "string"
       }
@@ -321,6 +299,9 @@
             },
             {
               "$ref": "#/definitions/multiple-constraints-dependency"
+            },
+            {
+              "$ref": "#/definitions/dependency-options"
             }
           ]
         }
@@ -566,6 +547,36 @@
         }
       }
     },
+    "dependency-options": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "python": {
+          "type": "string",
+          "description": "The python versions for which the dependency should be installed."
+        },
+        "platform": {
+          "type": "string",
+          "description": "The platform(s) for which the dependency should be installed."
+        },
+        "markers": {
+          "type": "string",
+          "description": "The PEP 508 compliant environment markers for which the dependency should be installed."
+        },
+        "allow-prereleases": {
+          "type": "boolean",
+          "description": "Whether the dependency allows prereleases or not."
+        },
+        "source": {
+          "type": "string",
+          "description": "The exclusive source used to search for this dependency."
+        },
+        "develop": {
+          "type": "boolean",
+          "description": "Whether to install the dependency in development mode."
+        }
+      }
+    },
     "multiple-constraints-dependency": {
       "type": "array",
       "minItems": 1,
@@ -588,6 +599,9 @@
           },
           {
             "$ref": "#/definitions/url-dependency"
+          },
+          {
+            "$ref": "#/definitions/dependency-options"
           }
         ]
       }

src/poetry/core/json/schemas/poetry-schema.json

@@ -0,0 +1,216 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "name": "Package",
+  "type": "object",
+  "additionalProperties": true,
+  "required": [
+    "name"
+  ],
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the project."
+    },
+    "version": {
+      "type": "string",
+      "description": "The version of the project."
+    },
+    "description": {
+      "type": "string",
+      "description": "The summary description of the project.",
+      "pattern": "^[^\n]*$"
+    },
+    "readme": {
+      "$ref": "#/definitions/readme",
+      "description": "The full description of the project (i.e. the README)."
+    },
+    "requires-python": {
+      "type": "string",
+      "description": "The Python version requirements of the project."
+    },
+    "license": {
+      "$ref": "#/definitions/license",
+      "description": "The license of the project (file or string)."
+    },
+    "authors": {
+      "$ref": "#/definitions/authors",
+      "description": "The authors of the project."
+    },
+    "maintainers": {
+      "$ref": "#/definitions/maintainers",
+      "description": "The maintainers of the project."
+    },
+    "keywords": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "description": "A tag/keyword that this project relates to."
+      }
+    },
+    "classifiers": {
+      "type": "array",
+      "description": "Trove classifiers which apply to the project."
+    },
+    "urls": {
+      "type": "object",
+      "patternProperties": {
+        "^.+$": {
+          "type": "string",
+          "description": "The full url of the custom url."
+        }
+      }
+    },
+    "scripts": {
+      "type": "object",
+      "description": "Names and object references of console scripts.",
+      "patternProperties": {
+        "^[a-zA-Z-_.0-9]+$": {
+          "type": "string"
+        }
+      }
+    },
+    "gui-scripts": {
+      "type": "object",
+      "description": "Names and object references of gui scripts.",
+      "patternProperties": {
+        "^[a-zA-Z-_.0-9]+$": {
+          "type": "string"
+        }
+      }
+    },
+    "entry-points": {
+      "type": "object",
+      "description": "Entry point groups. Each group is like scripts or gui-scripts.",
+      "patternProperties": {
+        "^[a-zA-Z-_.0-9]+$": {
+          "type": "object",
+          "patternProperties": {
+            "^[a-zA-Z-_.0-9]+$": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "dependencies": {
+      "type": "array",
+      "description": "A list of runtime dependencies in the PEP 508 format.",
+      "items": {
+        "type": "string"
+      }
+    },
+    "optional-dependencies": {
+      "type": "object",
+      "description": "Extras and their dependencies.",
+      "patternProperties": {
+        "^[a-zA-Z-_.0-9]+$": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "dynamic": {
+      "type": "array",
+      "description": "Keys that are defined dynamically or in a tool specific section.",
+      "items": {
+        "type": "string"
+      }
+    }
+  },
+  "definitions": {
+    "license": {
+      "oneOf": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "file": {
+              "type": "string"
+            }
+          }
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "text": {
+              "type": "string"
+            }
+          }
+        }
+      ]
+    },
+    "authors": {
+      "type": "array",
+      "description": "List of authors that contributed to the package. This is typically the main maintainers, not the full list.",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "maintainers": {
+      "type": "array",
+      "description": "List of maintainers, other than the original author(s), that upkeep the package.",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "readme": {
+      "oneOf": [
+        {
+          "type": "string",
+          "description": "Relative path to the README file"
+        },
+        {
+          "oneOf": [
+            {
+              "type": "object",
+              "description": "Readme with file and content type",
+              "properties": {
+                "file": {
+                  "type": "string",
+                  "description": "The relative path to the readme file"
+                },
+                "content-type": {
+                  "type": "string",
+                  "description": "The content type of the README file content"
+                }
+              }
+            },
+            {
+              "type": "object",
+              "description": "Readme with full description and content type",
+              "properties": {
+                "file": {
+                  "type": "string",
+                  "description": "The full content of the description"
+                },
+                "content-type": {
+                  "type": "string",
+                  "description": "The content type of the description"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

src/poetry/core/json/schemas/project-schema.json

@@ -54,7 +54,9 @@ def from_package(cls, package: Package) -> Metadata:
         meta.name = package.pretty_name
         meta.version = package.version.to_string()
         meta.summary = package.description
-        if package.readmes:
+        if package.readme_content:
+            meta.description = package.readme_content
+        elif package.readmes:
             descriptions = []
             for readme in package.readmes:
                 with readme.open(encoding="utf-8") as f:
@@ -82,14 +84,16 @@ def from_package(cls, package: Package) -> Metadata:
         meta.requires_dist = [d.to_pep_508() for d in package.requires]
 
         # Version 2.1
-        if package.readmes:
+        if package.readme_content_type:
+            meta.description_content_type = package.readme_content_type
+        elif package.readmes:
             meta.description_content_type = readme_content_type(package.readmes[0])
 
         meta.provides_extra = list(package.extras)
 
         if package.urls:
             for name, url in package.urls.items():
-                if name == "Homepage" and meta.home_page == url:
+                if name.lower() == "homepage" and meta.home_page == url:
                     continue
 
                 meta.project_urls += (f"{name}, {url}",)

src/poetry/core/masonry/metadata.py

@@ -110,6 +110,8 @@ def __init__(
         self.keywords: Sequence[str] = []
         self._license: License | None = None
         self.readmes: tuple[Path, ...] = ()
+        self.readme_content_type: str | None = None
+        self.readme_content: str | None = None
 
         self.extras: Mapping[NormalizedName, Sequence[Dependency]] = {}
 

src/poetry/core/packages/package.py

@@ -74,4 +74,16 @@ def is_poetry_project(self) -> bool:
                 _ = self.poetry_config
                 return True
 
+            # Even if there is no [tool.poetry] section, a project can still be a
+            # valid Poetry project if there is a name and a version in [project]
+            # and there are no dynamic fields.
+            with suppress(KeyError):
+                project = self.data["project"]
+                if (
+                    project["name"]
+                    and project["version"]
+                    and not project.get("dynamic")
+                ):
+                    return True
+
         return False

src/poetry/core/pyproject/toml.py

@@ -5,6 +5,9 @@ description = "Python dependency management and packaging made easy."
 authors = [
     "Sébastien Eustace <sebastien@eustace.io>"
 ]
+maintainers = [
+    "Sébastien Eustace <sebastien@eustace.io>"
+]
 license = "MIT"
 
 readme = "README.rst"
@@ -14,17 +17,21 @@ repository = "https://github.com/python-poetry/poetry"
 documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
 
 # Requirements
 [tool.poetry.dependencies]
-python = "~2.7 || ^3.2"  # Compatible python versions must be declared here
+python = "^3.8"  # Compatible python versions must be declared here
 toml = "^0.9"
 # Dependencies with extras
 requests = { version = "^2.13", extras = [ "security" ] }
 # Python specific dependencies with prereleases allowed
-pathlib2 = { version = "^2.2", python = "~2.7", allows-prereleases = true }
+pathlib2 = { version = "^2.2", python = "~3.8", allow-prereleases = true }
 # Git dependencies
-cleo = { git = "https://github.com/sdispater/cleo.git", branch = "master" }
+cleo = { git = "https://github.com/sdispater/cleo.git", branch = "main" }
 
 # Optional dependencies (extras)
 pendulum = { version = "^1.4", optional = true }
@@ -41,6 +48,9 @@ my-script = 'my_package:main'
 sample_pyscript = { reference = "script-files/sample_script.py", type= "file" }
 sample_shscript = { reference = "script-files/sample_script.sh", type= "file" }
 
+[tool.poetry.plugins."poetry.application.plugin"]
+my-command = "my_package.plugins:MyApplicationPlugin"
+
 
 [[tool.poetry.source]]
 name = "foo"

tests/fixtures/complete.toml

@@ -0,0 +1,96 @@
+[project]
+name = "poetry"
+version = "0.5.0"
+description = "Python dependency management and packaging made easy."
+readme = "README.rst"
+requires-python = ">=3.8"
+license = { "text" = "MIT" }
+authors = [
+    { "name" = "Sébastien Eustace", "email" = "sebastien@eustace.io" }
+]
+maintainers = [
+    { name = "Sébastien Eustace", email = "sebastien@eustace.io" }
+]
+keywords = ["packaging", "dependency", "poetry"]
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+dependencies = [
+    "toml>=0.9",
+    "requests[security]>=2.13,<3.0",
+    "pathlib2 ~=2.2 ; python_version == '3.8'",
+    "cleo @ git+https://github.com/sdispater/cleo.git@main",
+]
+
+[project.urls]
+homepage = "https://python-poetry.org/"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
+
+[project.optional-dependencies]
+time = [ "pendulum>1.4,<2.0" ]
+
+[project.scripts]
+my-script = "my_package:main"
+
+[project.entry-points."poetry.application.plugin"]
+my-command = "my_package.plugins:MyApplicationPlugin"
+
+[tool.poetry]
+name = "poetry"
+version = "0.5.0"
+description = "Python dependency management and packaging made easy."
+authors = [
+    "Sébastien Eustace <sebastien@eustace.io>"
+]
+maintainers = [
+    "Sébastien Eustace <sebastien@eustace.io>"
+]
+license = "MIT"
+
+readme = "README.rst"
+
+homepage = "https://python-poetry.org/"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
+
+keywords = ["packaging", "dependency", "poetry"]
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+
+# Requirements
+[tool.poetry.dependencies]
+python = "^3.8"  # Compatible python versions must be declared here
+toml = "^0.9"
+# Dependencies with extras
+requests = { version = "^2.13", extras = [ "security" ] }
+# Python specific dependencies with prereleases allowed
+pathlib2 = { version = "^2.2", python = "~3.8", allow-prereleases = true }
+# Git dependencies
+cleo = { git = "https://github.com/sdispater/cleo.git", branch = "master" }
+
+# Optional dependencies (extras)
+pendulum = { version = "^1.4", optional = true }
+
+[tool.poetry.extras]
+time = [ "pendulum" ]
+
+[tool.poetry.dev-dependencies]
+pytest = "^3.0"
+pytest-cov = "^2.4"
+
+[tool.poetry.scripts]
+my-script = 'my_package:main'
+sample_pyscript = { reference = "script-files/sample_script.py", type= "file" }
+sample_shscript = { reference = "script-files/sample_script.sh", type= "file" }
+
+[tool.poetry.plugins."poetry.application.plugin"]
+my-command = "my_package.plugins:MyApplicationPlugin"
+
+
+[[tool.poetry.source]]
+name = "foo"
+url = "https://bar.com"

tests/fixtures/complete_duplicates.toml

@@ -0,0 +1,62 @@
+[project]
+name = "poetry"
+version = "0.5.0"
+description = "Python dependency management and packaging made easy."
+readme = "README.rst"
+requires-python = ">=3.8"
+license = { "text" = "MIT" }
+authors = [
+    { "name" = "Sébastien Eustace", "email" = "sebastien@eustace.io" }
+]
+maintainers = [
+    { name = "Sébastien Eustace", email = "sebastien@eustace.io" }
+]
+keywords = ["packaging", "dependency", "poetry"]
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+dependencies = [
+    "toml>=0.9",
+    "requests[security]>=2.13,<3.0",
+    "pathlib2 ~=2.2 ; python_version == '3.8'",
+    "cleo @ git+https://github.com/sdispater/cleo.git@main",
+]
+
+[project.urls]
+homepage = "https://python-poetry.org/"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
+
+[project.optional-dependencies]
+time = [ "pendulum>1.4,<2.0" ]
+
+[project.scripts]
+my-script = "my_package:main"
+
+[project.entry-points."poetry.application.plugin"]
+my-command = "my_package.plugins:MyApplicationPlugin"
+
+# Requirements
+[tool.poetry.dependencies]
+python = "^3.8"  # Compatible python versions must be declared here
+toml = "^0.9"
+# Dependencies with extras
+requests = { version = "^2.13", extras = [ "security" ] }
+# Python specific dependencies with prereleases allowed
+pathlib2 = { version = "^2.2", python = "~3.8", allow-prereleases = true }
+# Git dependencies
+cleo = { git = "https://github.com/sdispater/cleo.git", branch = "master" }
+
+[tool.poetry.dev-dependencies]
+pytest = "^3.0"
+pytest-cov = "^2.4"
+
+[tool.poetry.scripts]
+sample_pyscript = { reference = "script-files/sample_script.py", type= "file" }
+sample_shscript = { reference = "script-files/sample_script.sh", type= "file" }
+
+
+[[tool.poetry.source]]
+name = "foo"
+url = "https://bar.com"

tests/fixtures/complete_new.toml

@@ -0,0 +1,75 @@
+[project]
+dynamic = [
+    "name",
+    "version",
+    "description",
+    "readme",
+    "requires-python",
+    "license",
+    "authors",
+    "maintainers",
+    "keywords",
+    "classifiers",
+    "urls",
+    "dependencies",
+    "optional-dependencies",
+    "scripts",
+]
+
+[tool.poetry]
+name = "poetry"
+version = "0.5.0"
+description = "Python dependency management and packaging made easy."
+authors = [
+    "Sébastien Eustace <sebastien@eustace.io>"
+]
+maintainers = [
+    "Sébastien Eustace <sebastien@eustace.io>"
+]
+license = "MIT"
+
+readme = "README.rst"
+
+homepage = "https://python-poetry.org/"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
+
+keywords = ["packaging", "dependency", "poetry"]
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+
+# Requirements
+[tool.poetry.dependencies]
+python = "^3.8"  # Compatible python versions must be declared here
+toml = "^0.9"
+# Dependencies with extras
+requests = { version = "^2.13", extras = [ "security" ] }
+# Python specific dependencies with prereleases allowed
+pathlib2 = { version = "^2.2", python = "~3.8", allow-prereleases = true }
+# Git dependencies
+cleo = { git = "https://github.com/sdispater/cleo.git", branch = "master" }
+
+# Optional dependencies (extras)
+pendulum = { version = "^1.4", optional = true }
+
+[tool.poetry.extras]
+time = [ "pendulum" ]
+
+[tool.poetry.dev-dependencies]
+pytest = "^3.0"
+pytest-cov = "^2.4"
+
+[tool.poetry.scripts]
+my-script = 'my_package:main'
+sample_pyscript = { reference = "script-files/sample_script.py", type= "file" }
+sample_shscript = { reference = "script-files/sample_script.sh", type= "file" }
+
+[project.entry-points."poetry.application.plugin"]
+my-command = "my_package.plugins:MyApplicationPlugin"
+
+
+[[tool.poetry.source]]
+name = "foo"
+url = "https://bar.com"

tests/fixtures/complete_new_dynamic.toml

@@ -1,10 +1,6 @@
 [tool.poetry]
-name = "invalid"
-version = "1.0.0"
-authors = [
-    "Foo <foo@bar.com>"
-]
-license = "INVALID"
+# name missing
+# version missing
 
 [tool.poetry.dependencies]
 python = "*"

tests/fixtures/invalid_pyproject/pyproject.toml

@@ -5,6 +5,9 @@ description = "Some description."
 authors = [
     "Sébastien Eustace <sebastien@eustace.io>"
 ]
+maintainers = [
+    "Sébastien Eustace <sebastien@eustace.io>"
+]
 license = "MIT"
 
 readme = "README.rst"
@@ -22,11 +25,11 @@ classifiers = [
 
 # Requirements
 [tool.poetry.dependencies]
-python = "~2.7 || ^3.6"
+python = ">=3.6"
 cleo = "^0.6"
 pendulum = { git = "https://github.com/sdispater/pendulum.git", branch = "2.0" }
 tomlkit = { git = "https://github.com/sdispater/tomlkit.git", rev = "3bff550", develop = false }
-requests = { version = "^2.18", optional = true, extras=[ "security" ] }
+requests = { version = "^2.18", optional = true, extras = [ "security" ] }
 pathlib2 = { version = "^2.2", python = "~2.7" }
 
 orator = { version = "^0.9", optional = true }
@@ -44,11 +47,12 @@ simple-project = { path = "../simple_project/" }
 functools32 = { version = "^3.2.3", markers = "python_version ~= '2.7' and sys_platform == 'win32' or python_version in '3.4 3.5'" }
 
 # Dependency with python constraint
-dataclasses = {version = "^0.7", python = ">=3.6.1,<3.7"}
+dataclasses = { version = "^0.7", python = ">=3.6.1,<3.7" }
 
 
 [tool.poetry.extras]
 db = [ "orator" ]
+network = [ "requests" ]
 
 # Non-regression test for https://github.com/python-poetry/poetry-core/pull/492.
 # The underlying issue occurred because `tomlkit` can either return a TOML table as `Table` instance or an

tests/fixtures/sample_project/pyproject.toml

@@ -0,0 +1,2 @@
+My Package
+==========

tests/fixtures/sample_project_new/README.rst

@@ -0,0 +1,62 @@
+[project]
+name = "my-package"
+version = "1.2.3"
+description = "Some description."
+readme = "README.rst"
+requires-python = ">=3.6"
+license = { text = "MIT" }
+keywords = ["packaging", "dependency", "poetry"]
+authors = [
+    { name = "Sébastien Eustace", email = "sebastien@eustace.io" }
+]
+maintainers = [
+    { name = "Sébastien Eustace", email = "sebastien@eustace.io" }
+]
+
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+
+# Requirements
+dependencies = [
+    "cleo ~=0.6",
+    "pendulum @ git+https://github.com/sdispater/pendulum.git@2.0",
+    "tomlkit @ git+https://github.com/sdispater/tomlkit.git@3bff550",
+    "pathlib2 ~=2.2 ; python_version == '2.7'",
+    # File dependency
+    "demo @ ../distributions/demo-0.1.0-py2.py3-none-any.whl",
+    # Dir dependency with setup.py
+    "my-package @ ../project_with_setup/",
+    # Dir dependency with pyproject.toml
+    "simple-project @ ../simple_project/",
+    # Dependency with markers
+    "functools32 ~=3.2.3 ; python_version ~= '2.7' and sys_platform == 'win32' or python_version in '3.4 3.5'",
+    # Dependency with python constraint
+    "dataclasses ~=0.7 ; python_full_version >= '3.6.1' and python_version < '3.7'"
+]
+
+[project.optional-dependencies]
+db = [
+    "orator ~=0.9"
+]
+network = [
+    "requests[security] ~=2.18"
+]
+
+[project.urls]
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
+
+[project.scripts]
+my-script = "my_package:main"
+
+[project.entry-points."blogtool.parsers"]
+".rst" = "some_module::SomeClass"
+
+[tool.poetry.dependencies]
+tomlkit = { develop = true }
+
+[tool.poetry.group.dev.dependencies]
+pytest = "~3.4"

tests/fixtures/sample_project_new/pyproject.toml

@@ -1,19 +1,10 @@
-[tool.poetry]
+[project]
 name = "my-package"
 version = "0.1"
-description = "Some description."
-authors = [
-    "Wagner Macedo <wagnerluis1982@gmail.com>"
-]
-license = "MIT"
+dynamic = ["readme"]
 
+[tool.poetry]
 readme = [
     "README-1.rst",
     "README-2.rst"
 ]
-
-homepage = "https://python-poetry.org/"
-
-
-[tool.poetry.dependencies]
-python = "^2.7"

tests/fixtures/with_readme_files/pyproject.toml

@@ -39,22 +39,6 @@ def multi_url_object() -> dict[str, Any]:
     }
 
 
-@pytest.mark.parametrize("explicit", [True, False])
-@pytest.mark.parametrize(
-    "missing_required", ["", "name", "version", "description", "authors"]
-)
-def test_package_mode(
-    base_object: dict[str, Any], explicit: bool, missing_required: str
-) -> None:
-    if explicit:
-        base_object["package-mode"] = True
-    if missing_required:
-        del base_object[missing_required]
-        assert len(validate_object(base_object, "poetry-schema")) == 1
-    else:
-        assert len(validate_object(base_object, "poetry-schema")) == 0
-
-
 def test_non_package_mode_no_metadata() -> None:
     assert len(validate_object({"package-mode": False}, "poetry-schema")) == 0
 

tests/json/test_poetry_schema.py

@@ -41,3 +41,28 @@ def poetry_section(pyproject_toml: Path) -> str:
     with pyproject_toml.open(mode="a", encoding="utf-8") as f:
         f.write(content)
     return content
+
+
+@pytest.fixture
+def project_section(pyproject_toml: Path) -> str:
+    content = """
+[project]
+name = "poetry"
+version = "1.0.0"
+"""
+    with pyproject_toml.open(mode="a", encoding="utf-8") as f:
+        f.write(content)
+    return content
+
+
+@pytest.fixture
+def project_section_dynamic(pyproject_toml: Path) -> str:
+    content = """
+[project]
+name = "not-poetry"
+version = "1.0.0"
+dynamic = ["description"]
+"""
+    with pyproject_toml.open(mode="a", encoding="utf-8") as f:
+        f.write(content)
+    return content

tests/pyproject/conftest.py

@@ -30,6 +30,36 @@ def test_pyproject_toml_no_poetry_config(pyproject_toml: Path) -> None:
     )
 
 
+def test_pyproject_toml_no_poetry_config_but_project_section(
+    pyproject_toml: Path, project_section: str
+) -> None:
+    pyproject = PyProjectTOML(pyproject_toml)
+
+    assert pyproject.is_poetry_project()
+
+    with pytest.raises(PyProjectException) as excval:
+        _ = pyproject.poetry_config
+
+    assert f"[tool.poetry] section not found in {pyproject_toml.as_posix()}" in str(
+        excval.value
+    )
+
+
+def test_pyproject_toml_no_poetry_config_but_project_section_but_dynamic(
+    pyproject_toml: Path, project_section_dynamic: str
+) -> None:
+    pyproject = PyProjectTOML(pyproject_toml)
+
+    assert not pyproject.is_poetry_project()
+
+    with pytest.raises(PyProjectException) as excval:
+        _ = pyproject.poetry_config
+
+    assert f"[tool.poetry] section not found in {pyproject_toml.as_posix()}" in str(
+        excval.value
+    )
+
+
 def test_pyproject_toml_poetry_config(
     pyproject_toml: Path, poetry_section: str
 ) -> None: