Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-poetry for openSUSE:Factory
checked in at 2023-01-16 17:59:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-poetry (Old)
and /work/SRC/openSUSE:Factory/.python-poetry.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-poetry"
Mon Jan 16 17:59:05 2023 rev:20 rq:1058560 version:1.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-poetry/python-poetry.changes
2022-12-15 20:29:01.533534244 +0100
+++ /work/SRC/openSUSE:Factory/.python-poetry.new.32243/python-poetry.changes
2023-01-16 18:01:40.515749552 +0100
@@ -1,0 +2,10 @@
+Sun Jan 15 19:56:34 UTC 2023 - Ben Greiner <c...@bnavigator.de>
+
+- Update to 1.3.2
+ * Fix a performance regression when locking dependencies from
+ PyPI (#7232).
+ * Fix an issue where passing a relative path via -C, --directory
+ fails (#7266).
+- Fix multibuild test src.rpm package names
+
+-------------------------------------------------------------------
Old:
----
poetry-1.3.1.tar.gz
New:
----
poetry-1.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-poetry.spec ++++++
--- /var/tmp/diff_new_pack.wljVoB/_old 2023-01-16 18:01:41.067752649 +0100
+++ /var/tmp/diff_new_pack.wljVoB/_new 2023-01-16 18:01:41.071752672 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package python-poetry
+# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,8 +25,8 @@
%bcond_with test
%endif
-Name: python-poetry
-Version: 1.3.1
+Name: python-poetry%{psuffix}
+Version: 1.3.2
Release: 0
Summary: Python dependency management and packaging
License: MIT
@@ -136,7 +136,7 @@
%doc README.md CHANGELOG.md
%license LICENSE
%{python_sitelib}/poetry
-%{python_sitelib}/poetry-%{version}*-info
+%{python_sitelib}/poetry-%{version}.dist-info
%python_alternative %{_bindir}/poetry
%endif
++++++ poetry-1.3.1.tar.gz -> poetry-1.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poetry-1.3.1/.github/workflows/main.yml
new/poetry-1.3.2/.github/workflows/main.yml
--- old/poetry-1.3.1/.github/workflows/main.yml 2022-12-12 02:30:26.000000000
+0100
+++ new/poetry-1.3.2/.github/workflows/main.yml 2023-01-10 07:46:58.000000000
+0100
@@ -83,6 +83,9 @@
# Using `timeout` is a safeguard against the Poetry command hanging
for some reason.
timeout 10s poetry run pip --version || rm -rf .venv
+ - name: Check lock file
+ run: poetry lock --check
+
- name: Install dependencies
run: poetry install --with github-actions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poetry-1.3.1/.github/workflows/skip.yml
new/poetry-1.3.2/.github/workflows/skip.yml
--- old/poetry-1.3.1/.github/workflows/skip.yml 2022-12-12 02:30:26.000000000
+0100
+++ new/poetry-1.3.2/.github/workflows/skip.yml 2023-01-10 07:46:58.000000000
+0100
@@ -28,6 +28,6 @@
strategy:
matrix:
os: [Ubuntu, macOS, Windows]
- python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
+ python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
steps:
- run: exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poetry-1.3.1/CHANGELOG.md
new/poetry-1.3.2/CHANGELOG.md
--- old/poetry-1.3.1/CHANGELOG.md 2022-12-12 02:30:26.000000000 +0100
+++ new/poetry-1.3.2/CHANGELOG.md 2023-01-10 07:46:58.000000000 +0100
@@ -1,6 +1,19 @@
# Change Log
+## [1.3.2] - 2022-01-10
+
+### Fixed
+
+- Fix a performance regression when locking dependencies from PyPI
([#7232](https://github.com/python-poetry/poetry/pull/7232)).
+- Fix an issue where passing a relative path via `-C, --directory` fails
([#7266](https://github.com/python-poetry/poetry/pull/7266)).
+
+### Docs
+
+- Update docs to reflect the removal of the deprecated `get-poetry.py`
installer from the repository
([#7288](https://github.com/python-poetry/poetry/pull/7288)).
+- Add clarifications for `virtualenvs.path` settings
([#7286](https://github.com/python-poetry/poetry/pull/7286)).
+
+
## [1.3.1] - 2022-12-12
### Fixed
@@ -1688,7 +1701,8 @@
-[Unreleased]: https://github.com/python-poetry/poetry/compare/1.3.1...master
+[Unreleased]: https://github.com/python-poetry/poetry/compare/1.3.2...master
+[1.3.2]: https://github.com/python-poetry/poetry/releases/tag/1.3.2
[1.3.1]: https://github.com/python-poetry/poetry/releases/tag/1.3.1
[1.3.0]: https://github.com/python-poetry/poetry/releases/tag/1.3.0
[1.2.2]: https://github.com/python-poetry/poetry/releases/tag/1.2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poetry-1.3.1/docs/_index.md
new/poetry-1.3.2/docs/_index.md
--- old/poetry-1.3.1/docs/_index.md 2022-12-12 02:30:26.000000000 +0100
+++ new/poetry-1.3.2/docs/_index.md 2023-01-10 07:46:58.000000000 +0100
@@ -46,9 +46,13 @@
(e.g. in a CI environment).
{{% warning %}}
-The previous `get-poetry.py` and `install-poetry.py` installers are
deprecated. Any installs performed
-using `get-poetry.py` should be uninstalled and reinstalled using
`install.python-poetry.org` to ensure
-in-place upgrades are possible.
+The `get-poetry.py` installer has been deprecated and removed. If you installed
+Poetry using `get-poetry.py`, please uninstall (as documented in the relevant
+step below), and then follow these installation instructions.
+
+The previous `install-poetry.py` script as included in the Poetry repository
+is deprecated and frozen. Please migrate to the standalone version described
+above, as the in-tree version is [scheduled to be
removed](https://github.com/python-poetry/poetry/issues/6676).
{{% /warning %}}
**Linux, macOS, Windows (WSL)**
@@ -182,11 +186,13 @@
```
{{% warning %}}
-If you installed using the deprecated `get-poetry.py` script, you should use
it to uninstall instead:
+If you installed using the deprecated `get-poetry.py` script, you should
remove the path it uses manually, e.g.
```bash
-curl -sSL
https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py |
python3 - --uninstall
+rm -rf "${POETRY_HOME:-~/.poetry}"
```
+
+Also remove ~/.poetry/bin from your `$PATH` in your shell configuration, if it
is present.
{{% /warning %}}
{{< /step >}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poetry-1.3.1/docs/configuration.md
new/poetry-1.3.2/docs/configuration.md
--- old/poetry-1.3.1/docs/configuration.md 2022-12-12 02:30:26.000000000
+0100
+++ new/poetry-1.3.2/docs/configuration.md 2023-01-10 07:46:58.000000000
+0100
@@ -356,6 +356,10 @@
Directory where virtual environments will be created.
+{{% note %}}
+This setting controls the global virtual environment storage path. It most
likely will not be useful at the local level. To store virtual environments in
the project root, see `virtualenvs.in-project`.
+{{% /note %}}
+
### `virtualenvs.prefer-active-python` (experimental)
**Type**: `boolean`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poetry-1.3.1/pyproject.toml
new/poetry-1.3.2/pyproject.toml
--- old/poetry-1.3.1/pyproject.toml 2022-12-12 02:30:26.000000000 +0100
+++ new/poetry-1.3.2/pyproject.toml 2023-01-10 07:46:58.000000000 +0100
@@ -1,6 +1,6 @@
[tool.poetry]
name = "poetry"
-version = "1.3.1"
+version = "1.3.2"
description = "Python dependency management and packaging made easy."
authors = [
"Sébastien Eustace <sebast...@eustace.io>",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poetry-1.3.1/src/poetry/masonry/builders/editable.py
new/poetry-1.3.2/src/poetry/masonry/builders/editable.py
--- old/poetry-1.3.1/src/poetry/masonry/builders/editable.py 2022-12-12
02:30:26.000000000 +0100
+++ new/poetry-1.3.2/src/poetry/masonry/builders/editable.py 2023-01-10
07:46:58.000000000 +0100
@@ -249,7 +249,7 @@
json.dumps(
{
"dir_info": {"editable": True},
- "url": self._poetry.file.path.parent.as_uri(),
+ "url": self._poetry.file.path.parent.absolute().as_uri(),
}
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/src/poetry/repositories/http_repository.py
new/poetry-1.3.2/src/poetry/repositories/http_repository.py
--- old/poetry-1.3.1/src/poetry/repositories/http_repository.py 2022-12-12
02:30:26.000000000 +0100
+++ new/poetry-1.3.2/src/poetry/repositories/http_repository.py 2023-01-10
07:46:58.000000000 +0100
@@ -30,8 +30,11 @@
if TYPE_CHECKING:
+ from packaging.utils import NormalizedName
+
from poetry.config.config import Config
from poetry.inspection.info import PackageInfo
+ from poetry.repositories.link_sources.base import LinkSource
from poetry.utils.authenticator import RepositoryCertificateConfig
@@ -293,8 +296,8 @@
)
return response
- def _get_page(self, endpoint: str) -> HTMLPage | None:
- response = self._get_response(endpoint)
+ def _get_page(self, name: NormalizedName) -> LinkSource:
+ response = self._get_response(f"/{name}/")
if not response:
- return None
+ raise PackageNotFound(f"Package [{name}] not found.")
return HTMLPage(response.url, response.text)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/src/poetry/repositories/legacy_repository.py
new/poetry-1.3.2/src/poetry/repositories/legacy_repository.py
--- old/poetry-1.3.1/src/poetry/repositories/legacy_repository.py
2022-12-12 02:30:26.000000000 +0100
+++ new/poetry-1.3.2/src/poetry/repositories/legacy_repository.py
2023-01-10 07:46:58.000000000 +0100
@@ -72,8 +72,9 @@
return package
def find_links_for_package(self, package: Package) -> list[Link]:
- page = self.get_page(f"/{package.name}/")
- if page is None:
+ try:
+ page = self.get_page(package.name)
+ except PackageNotFound:
return []
return list(page.links_for_version(package.name, package.version))
@@ -84,18 +85,10 @@
"""
Find packages on the remote server.
"""
- versions: list[tuple[Version, str | bool]]
-
- key: str = name
- if not constraint.is_any():
- key = f"{key}:{constraint!s}"
-
- page = self.get_page(f"/{name}/")
- if page is None:
- self._log(
- f"No packages found for {name}",
- level="debug",
- )
+ try:
+ page = self.get_page(name)
+ except PackageNotFound:
+ self._log(f"No packages found for {name}", level="debug")
return []
versions = [
@@ -119,9 +112,7 @@
def _get_release_info(
self, name: NormalizedName, version: Version
) -> dict[str, Any]:
- page = self.get_page(f"/{name}/")
- if page is None:
- raise PackageNotFound(f'No package named "{name}"')
+ page = self.get_page(name)
links = list(page.links_for_version(name, version))
yanked = page.yanked(name, version)
@@ -141,8 +132,8 @@
),
)
- def _get_page(self, endpoint: str) -> SimpleRepositoryPage | None:
- response = self._get_response(endpoint)
+ def _get_page(self, name: NormalizedName) -> SimpleRepositoryPage:
+ response = self._get_response(f"/{name}/")
if not response:
- return None
+ raise PackageNotFound(f"Package [{name}] not found.")
return SimpleRepositoryPage(response.url, response.text)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/src/poetry/repositories/pypi_repository.py
new/poetry-1.3.2/src/poetry/repositories/pypi_repository.py
--- old/poetry-1.3.1/src/poetry/repositories/pypi_repository.py 2022-12-12
02:30:26.000000000 +0100
+++ new/poetry-1.3.2/src/poetry/repositories/pypi_repository.py 2023-01-10
07:46:58.000000000 +0100
@@ -109,32 +109,18 @@
Find packages on the remote server.
"""
try:
- json_page = self.get_json_page(name)
+ json_page = self.get_page(name)
except PackageNotFound:
- self._log(
- f"No packages found for {name}",
- level="debug",
- )
+ self._log(f"No packages found for {name}", level="debug")
return []
- versions: list[tuple[Version, str | bool]]
-
- key: str = name
- if not constraint.is_any():
- key = f"{key}:{constraint!s}"
-
versions = [
(version, json_page.yanked(name, version))
for version in json_page.versions(name)
if constraint.allows(version)
]
- pretty_name = json_page.content["name"]
- packages = [
- Package(pretty_name, version, yanked=yanked) for version, yanked
in versions
- ]
-
- return packages
+ return [Package(name, version, yanked=yanked) for version, yanked in
versions]
def _get_package_info(self, name: str) -> dict[str, Any]:
headers = {"Accept": "application/vnd.pypi.simple.v1+json"}
@@ -224,7 +210,7 @@
return data.asdict()
- def get_json_page(self, name: NormalizedName) -> SimpleJsonPage:
+ def _get_page(self, name: NormalizedName) -> SimpleJsonPage:
source = self._base_url + f"simple/{name}/"
info = self.get_package_info(name)
return SimpleJsonPage(source, info)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/src/poetry/repositories/single_page_repository.py
new/poetry-1.3.2/src/poetry/repositories/single_page_repository.py
--- old/poetry-1.3.1/src/poetry/repositories/single_page_repository.py
2022-12-12 02:30:26.000000000 +0100
+++ new/poetry-1.3.2/src/poetry/repositories/single_page_repository.py
2023-01-10 07:46:58.000000000 +0100
@@ -1,15 +1,22 @@
from __future__ import annotations
+from typing import TYPE_CHECKING
+
+from poetry.repositories.exceptions import PackageNotFound
from poetry.repositories.legacy_repository import LegacyRepository
from poetry.repositories.link_sources.html import SimpleRepositoryPage
+if TYPE_CHECKING:
+ from packaging.utils import NormalizedName
+
+
class SinglePageRepository(LegacyRepository):
- def _get_page(self, endpoint: str | None = None) -> SimpleRepositoryPage |
None:
+ def _get_page(self, name: NormalizedName) -> SimpleRepositoryPage:
"""
Single page repositories only have one page irrespective of endpoint.
"""
response = self._get_response("")
if not response:
- return None
+ raise PackageNotFound(f"Package [{name}] not found.")
return SimpleRepositoryPage(response.url, response.text)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poetry-1.3.1/tests/installation/test_chooser.py
new/poetry-1.3.2/tests/installation/test_chooser.py
--- old/poetry-1.3.1/tests/installation/test_chooser.py 2022-12-12
02:30:26.000000000 +0100
+++ new/poetry-1.3.2/tests/installation/test_chooser.py 2023-01-10
07:46:58.000000000 +0100
@@ -98,7 +98,7 @@
parts = uri.rsplit("/")
name = parts[-2]
- fixture = LEGACY_FIXTURES / (name + "_partial_yank" + ".html")
+ fixture = LEGACY_FIXTURES / (name + "-partial-yank" + ".html")
with fixture.open(encoding="utf-8") as f:
return [200, headers, f.read()]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/tests/repositories/fixtures/legacy/futures-partial-yank.html
new/poetry-1.3.2/tests/repositories/fixtures/legacy/futures-partial-yank.html
---
old/poetry-1.3.1/tests/repositories/fixtures/legacy/futures-partial-yank.html
1970-01-01 01:00:00.000000000 +0100
+++
new/poetry-1.3.2/tests/repositories/fixtures/legacy/futures-partial-yank.html
2023-01-10 07:46:58.000000000 +0100
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Links for futures</title>
+ </head>
+ <body>
+ <h1>Links for futures</h1>
+ <a
href="https://files.pythonhosted.org/packages/2d/99/b2c4e9d5a30f6471e410a146232b4118e697fa3ffc06d6a65efde84debd0/futures-3.2.0-py2-none-any.whl#sha256=ec0a6cb848cc212002b9828c3e34c675e0c9ff6741dc445cab6fdd4e1085d1f1";
data-requires-python=">=2.6, <3"
data-yanked>futures-3.2.0-py2-none-any.whl</a><br/>
+ <a
href="https://files.pythonhosted.org/packages/1f/9e/7b2ff7e965fc654592269f2906ade1c7d705f1bf25b7d469fa153f7d19eb/futures-3.2.0.tar.gz#sha256=9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265";
data-requires-python=">=2.6, <3">futures-3.2.0.tar.gz</a><br/>
+ </body>
+</html>
+<!--SERIAL 3865286-->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/tests/repositories/fixtures/legacy/futures_partial_yank.html
new/poetry-1.3.2/tests/repositories/fixtures/legacy/futures_partial_yank.html
---
old/poetry-1.3.1/tests/repositories/fixtures/legacy/futures_partial_yank.html
2022-12-12 02:30:26.000000000 +0100
+++
new/poetry-1.3.2/tests/repositories/fixtures/legacy/futures_partial_yank.html
1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Links for futures</title>
- </head>
- <body>
- <h1>Links for futures</h1>
- <a
href="https://files.pythonhosted.org/packages/2d/99/b2c4e9d5a30f6471e410a146232b4118e697fa3ffc06d6a65efde84debd0/futures-3.2.0-py2-none-any.whl#sha256=ec0a6cb848cc212002b9828c3e34c675e0c9ff6741dc445cab6fdd4e1085d1f1";
data-requires-python=">=2.6, <3"
data-yanked>futures-3.2.0-py2-none-any.whl</a><br/>
- <a
href="https://files.pythonhosted.org/packages/1f/9e/7b2ff7e965fc654592269f2906ade1c7d705f1bf25b7d469fa153f7d19eb/futures-3.2.0.tar.gz#sha256=9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265";
data-requires-python=">=2.6, <3">futures-3.2.0.tar.gz</a><br/>
- </body>
-</html>
-<!--SERIAL 3865286-->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/tests/repositories/test_legacy_repository.py
new/poetry-1.3.2/tests/repositories/test_legacy_repository.py
--- old/poetry-1.3.1/tests/repositories/test_legacy_repository.py
2022-12-12 02:30:26.000000000 +0100
+++ new/poetry-1.3.2/tests/repositories/test_legacy_repository.py
2023-01-10 07:46:58.000000000 +0100
@@ -30,6 +30,7 @@
import httpretty
from _pytest.monkeypatch import MonkeyPatch
+ from packaging.utils import NormalizedName
from poetry.config.config import Config
@@ -45,16 +46,13 @@
def __init__(self) -> None:
super().__init__("legacy", url="http://legacy.foo.bar";,
disable_cache=True)
- def _get_page(self, endpoint: str) -> SimpleRepositoryPage | None:
- parts = endpoint.split("/")
- name = parts[1]
-
+ def _get_page(self, name: NormalizedName) -> SimpleRepositoryPage:
fixture = self.FIXTURES / (name + ".html")
if not fixture.exists():
- return None
+ raise PackageNotFound(f"Package [{name}] not found.")
with fixture.open(encoding="utf-8") as f:
- return SimpleRepositoryPage(self._url + endpoint, f.read())
+ return SimpleRepositoryPage(self._url + f"/{name}/", f.read())
def _download(self, url: str, dest: Path) -> None:
filename = urlparse.urlparse(url).path.rsplit("/")[-1]
@@ -73,7 +71,7 @@
def test_page_relative_links_path_are_correct() -> None:
repo = MockRepository()
- page = repo.get_page("/relative")
+ page = repo.get_page("relative")
assert page is not None
for link in page.links:
@@ -84,7 +82,7 @@
def test_page_absolute_links_path_are_correct() -> None:
repo = MockRepository()
- page = repo.get_page("/absolute")
+ page = repo.get_page("absolute")
assert page is not None
for link in page.links:
@@ -95,7 +93,7 @@
def test_page_clean_link() -> None:
repo = MockRepository()
- page = repo.get_page("/relative")
+ page = repo.get_page("relative")
assert page is not None
cleaned = page.clean_link('https://legacy.foo.bar/test /the"/cleaning\0')
@@ -105,7 +103,7 @@
def test_page_invalid_version_link() -> None:
repo = MockRepository()
- page = repo.get_page("/invalid-version")
+ page = repo.get_page("invalid-version")
assert page is not None
links = list(page.links)
@@ -123,7 +121,7 @@
def test_sdist_format_support() -> None:
repo = MockRepository()
- page = repo.get_page("/relative")
+ page = repo.get_page("relative")
assert page is not None
bz2_links = list(filter(lambda link: link.ext == ".tar.bz2", page.links))
assert len(bz2_links) == 1
@@ -441,8 +439,8 @@
def test_package_partial_yank():
class SpecialMockRepository(MockRepository):
- def _get_page(self, endpoint: str) -> SimpleRepositoryPage | None:
- return super()._get_page(f"/{endpoint.strip('/')}_partial_yank/")
+ def _get_page(self, name: NormalizedName) -> SimpleRepositoryPage:
+ return super()._get_page(canonicalize_name(f"{name}-partial-yank"))
repo = MockRepository()
package = repo.package("futures", Version.parse("3.2.0"))
@@ -488,31 +486,32 @@
def test_get_200_returns_page(http: type[httpretty.httpretty]) -> None:
- repo = MockHttpRepository({"/foo": 200}, http)
+ repo = MockHttpRepository({"/foo/": 200}, http)
- assert repo.get_page("/foo")
+ assert repo.get_page("foo")
@pytest.mark.parametrize("status_code", [401, 403, 404])
def test_get_40x_and_returns_none(
http: type[httpretty.httpretty], status_code: int
) -> None:
- repo = MockHttpRepository({"/foo": status_code}, http)
+ repo = MockHttpRepository({"/foo/": status_code}, http)
- assert repo.get_page("/foo") is None
+ with pytest.raises(PackageNotFound):
+ repo.get_page("foo")
def test_get_5xx_raises(http: type[httpretty.httpretty]) -> None:
- repo = MockHttpRepository({"/foo": 500}, http)
+ repo = MockHttpRepository({"/foo/": 500}, http)
with pytest.raises(RepositoryError):
- repo.get_page("/foo")
+ repo.get_page("foo")
def test_get_redirected_response_url(
http: type[httpretty.httpretty], monkeypatch: MonkeyPatch
) -> None:
- repo = MockHttpRepository({"/foo": 200}, http)
+ repo = MockHttpRepository({"/foo/": 200}, http)
redirect_url = "http://legacy.redirect.bar";
def get_mock(
@@ -524,7 +523,7 @@
return response
monkeypatch.setattr(repo.session, "get", get_mock)
- page = repo.get_page("/foo")
+ page = repo.get_page("foo")
assert page is not None
assert page._url == "http://legacy.redirect.bar/foo/";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/tests/repositories/test_pypi_repository.py
new/poetry-1.3.2/tests/repositories/test_pypi_repository.py
--- old/poetry-1.3.1/tests/repositories/test_pypi_repository.py 2022-12-12
02:30:26.000000000 +0100
+++ new/poetry-1.3.2/tests/repositories/test_pypi_repository.py 2023-01-10
07:46:58.000000000 +0100
@@ -332,14 +332,6 @@
assert repository.authenticated_url == "https://pypi.org/simple/";
-def test_use_pypi_pretty_name() -> None:
- repo = MockRepository(fallback=True)
-
- package = repo.find_packages(Factory.create_dependency("twisted", "*"))
- assert len(package) == 1
- assert package[0].pretty_name == "Twisted"
-
-
def test_find_links_for_package_of_supported_types():
repo = MockRepository()
package = repo.find_packages(Factory.create_dependency("hbmqtt", "0.9.6"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poetry-1.3.1/tests/repositories/test_single_page_repository.py
new/poetry-1.3.2/tests/repositories/test_single_page_repository.py
--- old/poetry-1.3.1/tests/repositories/test_single_page_repository.py
2022-12-12 02:30:26.000000000 +0100
+++ new/poetry-1.3.2/tests/repositories/test_single_page_repository.py
2023-01-10 07:46:58.000000000 +0100
@@ -3,13 +3,19 @@
import re
from pathlib import Path
+from typing import TYPE_CHECKING
from poetry.core.packages.dependency import Dependency
+from poetry.repositories.exceptions import PackageNotFound
from poetry.repositories.link_sources.html import SimpleRepositoryPage
from poetry.repositories.single_page_repository import SinglePageRepository
+if TYPE_CHECKING:
+ from packaging.utils import NormalizedName
+
+
class MockSinglePageRepository(SinglePageRepository):
FIXTURES = Path(__file__).parent / "fixtures" / "single-page"
@@ -20,10 +26,10 @@
disable_cache=True,
)
- def _get_page(self, endpoint: str = None) -> SimpleRepositoryPage | None:
+ def _get_page(self, name: NormalizedName) -> SimpleRepositoryPage:
fixture = self.FIXTURES / self.url.rsplit("/", 1)[-1]
if not fixture.exists():
- return
+ raise PackageNotFound(f"Package [{name}] not found.")
with fixture.open(encoding="utf-8") as f:
return SimpleRepositoryPage(self._url, f.read())
