Merge branch 'main' into main

Author: BlackGad

docs/cli.md

@@ -711,9 +711,15 @@ poetry publish
 It can also build the package if you pass it the `--build` option.
 
 {{% note %}}
-See [Publishable Repositories]({{< relref "repositories/#publishable-repositories" >}}) for more information on how to configure and use publishable repositories.
+See [Publishable Repositories]({{< relref "repositories/#publishable-repositories" >}}) for more information
+on how to configure and use publishable repositories.
 {{% /note %}}
 
+{{% warning %}}
+Only artifacts of the latest version of your package in the dist directory will be uploaded.
+Older versions from previous builds as well as artifacts of other packages are ignored.
+{{% /warning %}}
+
 #### Options
 
 * `--repository (-r)`: The repository to register the package to (default: `pypi`).

poetry.lock

@@ -82,8 +82,9 @@ def handle(self) -> int:
 
             self.call("build", args=f"--output {dist_dir}")
 
-        files = publisher.files
-        if not files:
+            publisher = Publisher(self.poetry, self.io, Path(dist_dir))
+
+        if not publisher.files:
             self.line_error(
                 "<error>No files to publish. "
                 "Run poetry build first or use the --build option.</error>"

src/poetry/console/commands/publish.py

@@ -102,10 +102,20 @@ def handle(self) -> int:
                     group_name=group_name,
                 )
                 if group_name != MAIN_GROUP:
-                    if not poetry_section and group_name in poetry_groups_content:
+                    if (
+                        not poetry_section
+                        and "dependencies" in poetry_groups_content.get(group_name, {})
+                    ):
                         del poetry_content["group"][group_name]["dependencies"]
+                        if not poetry_content["group"][group_name]:
+                            del poetry_content["group"][group_name]
                     if not standard_section and group_name in groups_content:
                         del groups_content[group_name]
+                    if (
+                        group_name not in groups_content
+                        and group_name not in poetry_groups_content
+                    ):
+                        self._remove_references_to_group(group_name, content)
 
         elif group == "dev" and "dev-dependencies" in poetry_content:
             # We need to account for the old `dev-dependencies` section
@@ -117,21 +127,20 @@ def handle(self) -> int:
                 del poetry_content["dev-dependencies"]
         else:
             removed = set()
-            if "group" in poetry_content:
-                if group in poetry_content["group"]:
-                    removed.update(
-                        self._remove_packages(
-                            packages=packages,
-                            standard_section=[],
-                            poetry_section=poetry_content["group"][group].get(
-                                "dependencies", {}
-                            ),
-                            group_name=group,
-                        )
+            if group_content := poetry_groups_content.get(group):
+                poetry_section = group_content.get("dependencies", {})
+                removed.update(
+                    self._remove_packages(
+                        packages=packages,
+                        standard_section=[],
+                        poetry_section=poetry_section,
+                        group_name=group,
                     )
-
-                if not poetry_content["group"][group]:
-                    del poetry_content["group"][group]
+                )
+                if not poetry_section and "dependencies" in group_content:
+                    del group_content["dependencies"]
+                    if not group_content:
+                        del poetry_content["group"][group]
             if group in groups_content:
                 removed.update(
                     self._remove_packages(
@@ -143,6 +152,8 @@ def handle(self) -> int:
                 )
                 if not groups_content[group]:
                     del groups_content[group]
+            if group not in groups_content and group not in poetry_groups_content:
+                self._remove_references_to_group(group, content)
 
         if "group" in poetry_content and not poetry_content["group"]:
             del poetry_content["group"]
@@ -200,3 +211,56 @@ def _remove_packages(
             group.remove_dependency(package)
 
         return removed
+
+    def _remove_references_to_group(
+        self, group_name: str, content: dict[str, Any]
+    ) -> None:
+        """
+        Removes references to the given group from other groups.
+        """
+        # 1. PEP 735: [dependency-groups]
+        if "dependency-groups" in content:
+            groups_to_remove = []
+            for group_key, group_content in content["dependency-groups"].items():
+                if not isinstance(group_content, list):
+                    continue
+
+                to_remove = []
+                for item in group_content:
+                    if (
+                        isinstance(item, dict)
+                        and item.get("include-group") == group_name
+                    ):
+                        to_remove.append(item)
+
+                for item in to_remove:
+                    group_content.remove(item)
+
+                # Clean up now-empty lists (normalize with legacy behavior)
+                # Only remove groups that became empty due to include-group cleanup,
+                # not the target group itself (which is handled by the caller)
+                if not group_content and group_key != group_name:
+                    groups_to_remove.append(group_key)
+
+            for group_key in groups_to_remove:
+                del content["dependency-groups"][group_key]
+
+        # 2. Legacy: [tool.poetry.group.<name>] include-groups = [...]
+        poetry_content = content.get("tool", {}).get("poetry", {})
+        if "group" in poetry_content:
+            groups_to_remove = []
+            for group_key, group_content in poetry_content["group"].items():
+                if "include-groups" not in group_content:
+                    continue
+
+                if group_name in group_content["include-groups"]:
+                    group_content["include-groups"].remove(group_name)
+
+                if not group_content["include-groups"]:
+                    del group_content["include-groups"]
+
+                    if not group_content:
+                        groups_to_remove.append(group_key)
+
+            for group_key in groups_to_remove:
+                del poetry_content["group"][group_key]

src/poetry/console/commands/remove.py

@@ -7,6 +7,7 @@
 import tempfile
 
 from pathlib import Path
+from tempfile import TemporaryDirectory
 from typing import TYPE_CHECKING
 from typing import Any
 
@@ -18,7 +19,6 @@
 from poetry.core.packages.package import Package
 from poetry.core.pyproject.toml import PyProjectTOML
 from poetry.core.utils.helpers import parse_requires
-from poetry.core.utils.helpers import temporary_directory
 from poetry.core.version.markers import InvalidMarkerError
 from poetry.core.version.requirements import InvalidRequirementError
 
@@ -317,7 +317,7 @@ def _from_sdist_file(cls, path: Path) -> PackageInfo:
         elif not zip:
             suffix = ".tar.gz"
 
-        with temporary_directory() as tmp_str:
+        with TemporaryDirectory(ignore_cleanup_errors=True) as tmp_str:
             tmp = Path(tmp_str)
             extractall(source=path, dest=tmp, zip=zip)
 
@@ -533,7 +533,7 @@ def get_pep517_metadata(path: Path) -> PackageInfo:
     """
     info = None
 
-    with tempfile.TemporaryDirectory() as dist:
+    with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as dist:
         try:
             dest = Path(dist)
 

src/poetry/inspection/info.py

@@ -3,10 +3,9 @@
 import tempfile
 
 from pathlib import Path
+from tempfile import TemporaryDirectory
 from typing import TYPE_CHECKING
 
-from poetry.core.utils.helpers import temporary_directory
-
 from poetry.utils.helpers import extractall
 from poetry.utils.isolated_build import isolated_builder
 
@@ -100,7 +99,7 @@ def _prepare_sdist(
         suffix = archive.suffix
         zip = suffix == ".zip"
 
-        with temporary_directory() as tmp_dir:
+        with TemporaryDirectory(ignore_cleanup_errors=True) as tmp_dir:
             archive_dir = Path(tmp_dir)
             extractall(source=archive, dest=archive_dir, zip=zip)
 

src/poetry/installation/chef.py

@@ -29,6 +29,7 @@
 
 from poetry.__version__ import __version__
 from poetry.packages.transitive_package_info import TransitivePackageInfo
+from poetry.packages.transitive_package_info import group_sort_key
 from poetry.toml.file import TOMLFile
 from poetry.utils._compat import tomllib
 
@@ -583,7 +584,7 @@ def _dump_package(
             "description": package.description or "",
             "optional": package.optional,
             "python-versions": package.python_versions,
-            "groups": sorted(transitive_info.groups, key=lambda x: (x != "main", x)),
+            "groups": sorted(transitive_info.groups, key=group_sort_key),
         }
         if transitive_info.markers:
             if len(markers := set(transitive_info.markers.values())) == 1:
@@ -593,7 +594,7 @@ def _dump_package(
                 data["markers"] = inline_table()
                 for group, marker in sorted(
                     transitive_info.markers.items(),
-                    key=lambda x: (x[0] != "main", x[0]),
+                    key=lambda x: group_sort_key(x[0]),
                 ):
                     if not marker.is_any():
                         data["markers"][group] = str(marker)

src/poetry/packages/locker.py

@@ -3,6 +3,7 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
+from poetry.core.packages.dependency_group import MAIN_GROUP
 from poetry.core.version.markers import BaseMarker
 from poetry.core.version.markers import EmptyMarker
 
@@ -13,6 +14,10 @@
     from packaging.utils import NormalizedName
 
 
+def group_sort_key(group: NormalizedName) -> tuple[bool, NormalizedName]:
+    return group != MAIN_GROUP, group
+
+
 @dataclass
 class TransitivePackageInfo:
     depth: int  # max depth in the dependency tree
@@ -21,7 +26,7 @@ class TransitivePackageInfo:
 
     def get_marker(self, groups: Iterable[NormalizedName]) -> BaseMarker:
         marker: BaseMarker = EmptyMarker()
-        for group in groups:
+        for group in sorted(groups, key=group_sort_key):
             if group_marker := self.markers.get(group):
                 marker = marker.union(group_marker)
         return marker

src/poetry/packages/transitive_package_info.py

@@ -79,7 +79,7 @@ def publish(
             repository_name = "PyPI"
         self._io.write_line(
             f"Publishing <c1>{self._package.pretty_name}</c1>"
-            f" (<c2>{self._package.pretty_version}</c2>) to"
+            f" (<c2>{self._uploader.version}</c2>) to"
             f" <info>{repository_name}</info>"
         )
 

src/poetry/publishing/publisher.py

@@ -1,8 +1,11 @@
 from __future__ import annotations
 
+import itertools
 import tarfile
 import zipfile
 
+from collections import defaultdict
+from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
@@ -12,6 +15,7 @@
 
 from packaging.metadata import RawMetadata
 from packaging.metadata import parse_email
+from poetry.core.constraints.version import Version
 from poetry.core.masonry.utils.helpers import distribution_name
 from requests_toolbelt import user_agent
 from requests_toolbelt.multipart import MultipartEncoder
@@ -36,7 +40,7 @@ class UploadError(Exception):
 class Uploader:
     def __init__(self, poetry: Poetry, io: IO, dist_dir: Path | None = None) -> None:
         self._poetry = poetry
-        self._package = poetry.package
+        self._dist_name = distribution_name(poetry.package.name)
         self._io = io
         self._dist_dir = dist_dir or self.default_dist_dir
         self._username: str | None = None
@@ -60,14 +64,39 @@ def dist_dir(self) -> Path:
 
     @property
     def files(self) -> list[Path]:
-        dist = self.dist_dir
-        version = self._package.version.to_string()
-        escaped_name = distribution_name(self._package.name)
+        return self._files_and_version[0]
 
-        wheels = list(dist.glob(f"{escaped_name}-{version}-*.whl"))
-        tars = list(dist.glob(f"{escaped_name}-{version}.tar.gz"))
+    @property
+    def version(self) -> str:
+        return self._files_and_version[1]
 
-        return sorted(wheels + tars)
+    @cached_property
+    def _files_and_version(self) -> tuple[list[Path], str]:
+        dist = self.dist_dir
+
+        wheels = dist.glob(f"{self._dist_name}-*-*.whl")
+        tars = dist.glob(f"{self._dist_name}-*.tar.gz")
+        artifacts_by_version = defaultdict(list)
+        for artifact in itertools.chain(wheels, tars):
+            version = (
+                artifact.stem.removesuffix(".tar")
+                .removeprefix(f"{self._dist_name}-")
+                .split("-", maxsplit=1)[0]
+            )
+            artifacts_by_version[version].append(artifact)
+        match len(artifacts_by_version):
+            case 0:
+                return [], ""
+            case 1:
+                latest_version = next(iter(artifacts_by_version))
+                artifacts = artifacts_by_version[latest_version]
+            case _:
+                latest_version = max(
+                    artifacts_by_version, key=lambda v: Version.parse(v)
+                )
+                artifacts = artifacts_by_version[latest_version]
+
+        return sorted(artifacts, key=lambda a: (a.suffix == ".whl", a)), latest_version
 
     def auth(self, username: str | None, password: str | None) -> None:
         self._username = username
@@ -258,14 +287,7 @@ def _register(self, session: requests.Session, url: str) -> requests.Response:
         """
         Register a package to a repository.
         """
-        dist = self.dist_dir
-        escaped_name = distribution_name(self._package.name)
-        file = dist / f"{escaped_name}-{self._package.version.to_string()}.tar.gz"
-
-        if not file.exists():
-            raise RuntimeError(f'"{file.name}" does not exist.')
-
-        data = self.post_data(file)
+        data = self.post_data(self.files[0])
         data.update({":action": "submit", "protocol_version": "1"})
 
         data_to_send = self._prepare_data(data)