feat: allow publishing artifacts if version is determined dynamically (#10644)

radoering · web-flow · commit 364c2c5be9a6 · 2025-12-29T14:16:02.000+01:00
diff --git a/docs/cli.md b/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`).
diff --git a/src/poetry/console/commands/publish.py b/src/poetry/console/commands/publish.py
@@ -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>"
diff --git a/src/poetry/publishing/publisher.py b/src/poetry/publishing/publisher.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>"
         )
 
diff --git a/src/poetry/publishing/uploader.py b/src/poetry/publishing/uploader.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)
diff --git a/tests/publishing/test_publisher.py b/tests/publishing/test_publisher.py
@@ -50,6 +50,8 @@ def test_publish_can_publish_to_given_repository(
     config: Config,
     fixture_name: str,
 ) -> None:
+    uploader_version = "1.2.3+test"
+    mocker.patch("poetry.publishing.uploader.Uploader.version", uploader_version)
     uploader_auth = mocker.patch("poetry.publishing.uploader.Uploader.auth")
     uploader_upload = mocker.patch("poetry.publishing.uploader.Uploader.upload")
 
@@ -62,6 +64,9 @@ def test_publish_can_publish_to_given_repository(
 
     mocker.patch("poetry.config.config.Config.create", return_value=config)
     poetry = Factory().create_poetry(fixture_dir(fixture_name))
+    # Normally both versions are equal, but we want to check that the correct version
+    # is displayed in the output if they are different.
+    assert poetry.package.version != uploader_version
 
     io = BufferedIO()
     publisher = Publisher(poetry, io)
@@ -74,7 +79,7 @@ def test_publish_can_publish_to_given_repository(
         {"cert": True, "client_cert": None, "dry_run": False, "skip_existing": False},
     ]
     project_name = canonicalize_name(fixture_name)
-    assert f"Publishing {project_name} (1.2.3) to foo" in io.fetch_output()
+    assert f"Publishing {project_name} ({uploader_version}) to foo" in io.fetch_output()
 
 
 def test_publish_raises_error_for_undefined_repository(
diff --git a/tests/publishing/test_uploader.py b/tests/publishing/test_uploader.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import shutil
+
 from typing import TYPE_CHECKING
 
 import pytest
@@ -12,16 +14,116 @@
 
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     import responses
 
     from pytest_mock import MockerFixture
 
+    from poetry.poetry import Poetry
     from tests.types import FixtureDirGetter
 
 
 @pytest.fixture
-def uploader(fixture_dir: FixtureDirGetter) -> Uploader:
-    return Uploader(Factory().create_poetry(fixture_dir("simple_project")), NullIO())
+def poetry(fixture_dir: FixtureDirGetter) -> Poetry:
+    return Factory().create_poetry(fixture_dir("simple_project"))
+
+
+@pytest.fixture
+def uploader(poetry: Poetry) -> Uploader:
+    return Uploader(poetry, NullIO())
+
+
+@pytest.mark.parametrize(
+    ("files", "expected_files", "expected_version"),
+    [
+        ([], [], ""),
+        (
+            ["simple_project-1.2.3.tar.gz", "simple_project-1.2.3-py3-none-any.whl"],
+            ["simple_project-1.2.3.tar.gz", "simple_project-1.2.3-py3-none-any.whl"],
+            "1.2.3",
+        ),
+        (  # other names are ignored
+            [
+                "simple_project-1.2.3.tar.gz",
+                "other_project-1.2.3.tar.gz",
+                "simple_project-1.2.3-py3-none-any.whl",
+                "other_project-1.2.3-py3-none-any.whl",
+            ],
+            ["simple_project-1.2.3.tar.gz", "simple_project-1.2.3-py3-none-any.whl"],
+            "1.2.3",
+        ),
+        (  # older versions are ignored
+            [
+                "simple_project-1.2.3.tar.gz",
+                "simple_project-1.2.4.tar.gz",
+                "simple_project-1.2.3-py3-none-any.whl",
+                "simple_project-1.2.4-py3-none-any.whl",
+            ],
+            ["simple_project-1.2.4.tar.gz", "simple_project-1.2.4-py3-none-any.whl"],
+            "1.2.4",
+        ),
+        (  # older versions are ignored - only new sdist
+            [
+                "simple_project-1.2.3.tar.gz",
+                "simple_project-1.2.4.tar.gz",
+                "simple_project-1.2.3-py3-none-any.whl",
+            ],
+            ["simple_project-1.2.4.tar.gz"],
+            "1.2.4",
+        ),
+        (  # older versions are ignored - only new wheel
+            [
+                "simple_project-1.2.3.tar.gz",
+                "simple_project-1.2.3-py3-none-any.whl",
+                "simple_project-1.2.4-py3-none-any.whl",
+            ],
+            ["simple_project-1.2.4-py3-none-any.whl"],
+            "1.2.4",
+        ),
+        (  # older versions are ignored - local version
+            [
+                "simple_project-1.2.3.tar.gz",
+                "simple_project-1.2.3+hash1.tar.gz",
+                "simple_project-1.2.3+hash2.tar.gz",
+                "simple_project-1.2.3-py3-none-any.whl",
+                "simple_project-1.2.3+hash1-py3-none-any.whl",
+                "simple_project-1.2.3+hash2-py3-none-any.whl",
+            ],
+            [
+                "simple_project-1.2.3+hash2.tar.gz",
+                "simple_project-1.2.3+hash2-py3-none-any.whl",
+            ],
+            "1.2.3+hash2",
+        ),
+        (  # older versions are ignore - pre-release
+            [
+                "simple_project-1.2.3rc1.tar.gz",
+                "simple_project-1.2.3rc1-py3-none-any.whl",
+                "simple_project-1.2.3.tar.gz",
+                "simple_project-1.2.3-py3-none-any.whl",
+            ],
+            [
+                "simple_project-1.2.3.tar.gz",
+                "simple_project-1.2.3-py3-none-any.whl",
+            ],
+            "1.2.3",
+        ),
+    ],
+)
+def test_uploader_files_only_latest(
+    poetry: Poetry,
+    tmp_path: Path,
+    files: list[str],
+    expected_files: list[str],
+    expected_version: str,
+) -> None:
+    for file in files:
+        (tmp_path / file).touch()
+    uploader = Uploader(poetry, NullIO(), dist_dir=tmp_path)
+
+    assert uploader.files == [tmp_path / f for f in expected_files]
+    assert uploader.version == expected_version
 
 
 def test_uploader_properly_handles_400_errors(
@@ -105,16 +207,49 @@ def test_uploader_properly_handles_301_redirects(
     )
 
 
-def test_uploader_registers_for_appropriate_400_errors(
-    mocker: MockerFixture, http: responses.RequestsMock, uploader: Uploader
+def test_uploader_registers_with_sdist_for_appropriate_400_errors(
+    http: responses.RequestsMock, uploader: Uploader
 ) -> None:
-    register = mocker.patch("poetry.publishing.uploader.Uploader._register")
     http.post("https://foo.com", status=400, body="No package was ever registered")
 
     with pytest.raises(UploadError):
         uploader.upload("https://foo.com")
 
-    assert register.call_count == 1
+    assert len(http.calls) == 2
+    bodies = [c.request.body or b"" for c in http.calls]
+    assert b'name=":action"\r\n\r\nfile_upload\r\n' in bodies[0]
+    assert b'name=":action"\r\n\r\nsubmit\r\n' in bodies[1]
+    assert b"sdist" in bodies[0]
+    assert b"sdist" in bodies[1]
+    assert b"bdist_wheel" not in bodies[0]
+    assert b"bdist_wheel" not in bodies[1]
+
+
+def test_uploader_register_uses_wheel_if_no_sdist(
+    http: responses.RequestsMock, poetry: Poetry, tmp_path: Path
+) -> None:
+    dist_dir = tmp_path / "dist"
+    dist_dir.mkdir()
+    shutil.copy(
+        poetry.file.path.parent / "dist" / "simple_project-1.2.3-py2.py3-none-any.whl",
+        dist_dir,
+    )
+
+    uploader = Uploader(poetry, NullIO(), dist_dir=dist_dir)
+
+    http.post("https://foo.com", status=400, body="No package was ever registered")
+
+    with pytest.raises(UploadError):
+        uploader.upload("https://foo.com")
+
+    assert len(http.calls) == 2
+    bodies = [c.request.body or b"" for c in http.calls]
+    assert b'name=":action"\r\n\r\nfile_upload\r\n' in bodies[0]
+    assert b'name=":action"\r\n\r\nsubmit\r\n' in bodies[1]
+    assert b"sdist" not in bodies[0]
+    assert b"sdist" not in bodies[1]
+    assert b"bdist_wheel" in bodies[0]
+    assert b"bdist_wheel" in bodies[1]
 
 
 @pytest.mark.parametrize(

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ def publish(`
`79`	`79`	`repository_name = "PyPI"`
`80`	`80`	`self._io.write_line(`
`81`	`81`	`f"Publishing <c1>{self._package.pretty_name}</c1>"`
`82`		`- f" (<c2>{self._package.pretty_version}</c2>) to"`
	`82`	`+ f" (<c2>{self._uploader.version}</c2>) to"`
`83`	`83`	`f" <info>{repository_name}</info>"`
`84`	`84`	`)`
`85`	`85`