fix: do not ignore dynamic project dependencies via tool.poetry.dependencies if project.optional-dependencies are defined

Author: radoering

src/poetry/core/packages/dependency_group.py

@@ -26,7 +26,20 @@ def name(self) -> str:
 
     @property
     def dependencies(self) -> list[Dependency]:
-        return self._dependencies or self._poetry_dependencies
+        if not self._dependencies:
+            return self._poetry_dependencies
+        if self._poetry_dependencies:
+            if all(dep.is_optional() for dep in self._dependencies):
+                return [
+                    *self._dependencies,
+                    *(d for d in self._poetry_dependencies if not d.is_optional()),
+                ]
+            if all(not dep.is_optional() for dep in self._dependencies):
+                return [
+                    *self._dependencies,
+                    *(d for d in self._poetry_dependencies if d.is_optional()),
+                ]
+        return self._dependencies
 
     @property
     def dependencies_for_locking(self) -> list[Dependency]:
@@ -40,7 +53,7 @@ def dependencies_for_locking(self) -> list[Dependency]:
             poetry_dependencies_by_name[dep.name].append(dep)
 
         dependencies = []
-        for dep in self._dependencies:
+        for dep in self.dependencies:
             if dep.name in poetry_dependencies_by_name:
                 enriched = False
                 dep_marker = dep.marker

tests/fixtures/sample_project_dynamic/README.rst

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

tests/fixtures/sample_project_dynamic/pyproject.toml

@@ -0,0 +1,83 @@
+[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" }
+]
+dynamic = [ "version", "readme", "dependencies", "classifiers" ]
+
+[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"
+
+[tool.poetry]
+version = "1.2.3"
+readme = "README.rst"
+classifiers = [
+    "Topic :: Software Development :: Build Tools",
+    "Topic :: Software Development :: Libraries :: Python Modules"
+]
+
+# Requirements
+[tool.poetry.dependencies]
+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 = true }
+pathlib2 = { version = "^2.2", python = "~2.7" }
+
+# File dependency
+demo = { path = "../distributions/demo-0.1.0-py2.py3-none-any.whl" }
+
+# Dir dependency with setup.py
+my-package = { path = "../project_with_setup/" }
+
+# Dir dependency with pyproject.toml
+simple-project = { path = "../simple_project/" }
+
+# Dependency with markers
+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" }
+
+
+# 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
+# `OutOfOrderProxy` one, if a table is discontinuous and multiple sections of a table are separated by a non-related
+# table, but we were too strict in our type check assertions.
+# So adding `tool.black` here ensure that we have discontinuous tables, so that we don't re-introduce the issue caused
+# by the type check assertion that ended up being reverted.
+[tool.black]
+preview = true
+
+[tool.poetry.group.dev.dependencies]
+pytest = "~3.4"
+
+
+[tool.poetry.scripts]
+my-script = "my_package:main"
+
+
+[tool.poetry.plugins."blogtool.parsers"]
+".rst" = "some_module::SomeClass"

tests/masonry/builders/fixtures/complete_dynamic/AUTHORS

@@ -0,0 +1,20 @@
+Copyright (c) 2018 Sébastien Eustace
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

tests/masonry/builders/fixtures/complete_dynamic/COPYING

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

tests/masonry/builders/fixtures/complete_dynamic/LICENCE

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo "Hello World!"

tests/masonry/builders/fixtures/complete_dynamic/LICENSE

@@ -0,0 +1 @@
+__version__ = "1.2.3"