From f0cc2362a15a9d139a2967f0a3eba2395f01ca30 Mon Sep 17 00:00:00 2001 From: Arie Bovenberg Date: Fri, 11 Sep 2020 16:04:48 +0200 Subject: [PATCH 1/2] Display actual repository name in publish, not always PyPI --- poetry/publishing/publisher.py | 2 +- tests/publishing/test_publisher.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/poetry/publishing/publisher.py b/poetry/publishing/publisher.py index d30a9a47119..67515f77f64 100644 --- a/poetry/publishing/publisher.py +++ b/poetry/publishing/publisher.py @@ -86,7 +86,7 @@ def publish( "to {}".format( self._package.pretty_name, self._package.pretty_version, - {"pypi": "PyPI"}.get(repository_name, "PyPI"), + "PyPI" if repository_name == "pypi" else repository_name, ) ) diff --git a/tests/publishing/test_publisher.py b/tests/publishing/test_publisher.py index da376120645..bee39421eed 100644 --- a/tests/publishing/test_publisher.py +++ b/tests/publishing/test_publisher.py @@ -1,6 +1,7 @@ import os import pytest +from cleo.io import BufferedIO from poetry.factory import Factory from poetry.io.null_io import NullIO @@ -38,7 +39,8 @@ def test_publish_can_publish_to_given_repository(fixture_dir, mocker, config): "http-basic": {"my-repo": {"username": "foo", "password": "bar"}}, } ) - publisher = Publisher(poetry, NullIO()) + io = BufferedIO() + publisher = Publisher(poetry, io) publisher.publish("my-repo", None, None) @@ -47,6 +49,7 @@ def test_publish_can_publish_to_given_repository(fixture_dir, mocker, config): ("http://foo.bar",), {"cert": None, "client_cert": None, "dry_run": False}, ] == uploader_upload.call_args + assert "Publishing my-package (1.2.3) to my-repo" in io.fetch_output() def test_publish_raises_error_for_undefined_repository(fixture_dir, mocker, config): From 843f790d477719a82733b541fb153302674fba8a Mon Sep 17 00:00:00 2001 From: Arie Bovenberg Date: Fri, 11 Sep 2020 16:25:14 +0200 Subject: [PATCH 2/2] isort fix --- tests/publishing/test_publisher.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/publishing/test_publisher.py b/tests/publishing/test_publisher.py index bee39421eed..a86c482226e 100644 --- a/tests/publishing/test_publisher.py +++ b/tests/publishing/test_publisher.py @@ -1,6 +1,7 @@ import os import pytest + from cleo.io import BufferedIO from poetry.factory import Factory