Date: Sat, 26 Aug 2023 09:30:48 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5a5157e46cef - main - devel/py-poetry: Update to 1.6.1 Message-ID: <202308260930.37Q9UmoT089987@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a5157e46cefe90719bebb585c19a735422ad4f9 commit 5a5157e46cefe90719bebb585c19a735422ad4f9 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-08-26 09:27:32 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-08-26 09:27:32 +0000 devel/py-poetry: Update to 1.6.1 Changes: https://github.com/python-poetry/poetry/releases --- devel/py-poetry/Makefile | 13 ++- devel/py-poetry/distinfo | 6 +- devel/py-poetry/files/patch-cachecontrol | 151 ----------------------------- devel/py-poetry/files/patch-pyproject.toml | 11 +++ 4 files changed, 20 insertions(+), 161 deletions(-) diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile index 22cb9037619f..12fcc8d3abeb 100644 --- a/devel/py-poetry/Makefile +++ b/devel/py-poetry/Makefile @@ -1,5 +1,5 @@ PORTNAME= poetry -PORTVERSION= 1.5.1 +PORTVERSION= 1.6.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,18 +18,17 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0.10.0<0.11:devel/py-build@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}cleo>=2.0.0<3:devel/py-cleo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}crashtest>=0.4.1<0.5:devel/py-crashtest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.21.2<0.22:devel/py-dulwich@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}html5lib>=1.0<2:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}installer>=0.7.0<0.8:devel/py-installer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.10.0<5:devel/py-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keyring>=23.9.0,1<24,1:security/py-keyring@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema417>=4.10.0<4.18.0:devel/py-jsonschema417@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keyring>=23.9.0,1<25,1:security/py-keyring@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.4:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>=4.7.0<5:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.9.4<2:sysutils/py-pkginfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=3.0.0<4:devel/py-platformdirs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.6.1<1.6.1_99:devel/py-poetry-core@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}poetry-plugin-export>=1.4.0<2:devel/py-poetry-plugin-export@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.7.0<1.7.0_99:devel/py-poetry-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}poetry-plugin-export>=1.5.0<2:devel/py-poetry-plugin-export@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject_hooks>=1.0.0<2:devel/py-pyproject_hooks@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.18<3:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.26<3:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1<2:www/py-requests-toolbelt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shellingham>=1.5<2:devel/py-shellingham@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomlkit>=0.11.4<1.0.0:textproc/py-tomlkit@${PY_FLAVOR} \ diff --git a/devel/py-poetry/distinfo b/devel/py-poetry/distinfo index 2e3aba834bf9..d0b7c74914f5 100644 --- a/devel/py-poetry/distinfo +++ b/devel/py-poetry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688902137 -SHA256 (poetry-1.5.1.tar.gz) = cc7ea4524d1a11558006224bfe8ba8ed071417d4eb5ef6c89decc6a37d437eeb -SIZE (poetry-1.5.1.tar.gz) = 1469755 +TIMESTAMP = 1692812418 +SHA256 (poetry-1.6.1.tar.gz) = 0ab9b1a592731cc8b252b8d6aaeea19c72cc0a109d7468b829ad57e6c48039d2 +SIZE (poetry-1.6.1.tar.gz) = 1475487 diff --git a/devel/py-poetry/files/patch-cachecontrol b/devel/py-poetry/files/patch-cachecontrol deleted file mode 100644 index d8d20e9e4a83..000000000000 --- a/devel/py-poetry/files/patch-cachecontrol +++ /dev/null @@ -1,151 +0,0 @@ -Obtained from: https://github.com/python-poetry/poetry/commit/fca3d5d04fb01bbb3c77e810094a99732b7d024c - ---- pyproject.toml.orig 2023-05-29 16:05:02 UTC -+++ pyproject.toml -@@ -36,17 +36,15 @@ poetry-core = "1.6.1" - poetry-plugin-export = "^1.4.0" - "backports.cached-property" = { version = "^1.0.2", python = "<3.8" } - build = "^0.10.0" --cachecontrol = { version = "^0.12.9", extras = ["filecache"] } -+cachecontrol = { version = "^0.13.0", extras = ["filecache"] } - cleo = "^2.0.0" - crashtest = "^0.4.1" - dulwich = "^0.21.2" --filelock = "^3.8.0" - html5lib = "^1.0" - importlib-metadata = { version = ">=4.4", python = "<3.10" } - installer = "^0.7.0" - jsonschema = "^4.10.0" - keyring = "^23.9.0" --lockfile = "^0.12.2" - # packaging uses calver, so version is unclamped - packaging = ">=20.4" - pexpect = "^4.7.0" -@@ -62,7 +60,6 @@ tomlkit = ">=0.11.4,<1.0.0" - trove-classifiers = ">=2022.5.19" - virtualenv = "^20.22.0" - xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" } --urllib3 = "^1.26.0" - - [tool.poetry.group.dev.dependencies] - pre-commit = "^2.6" -@@ -189,18 +186,15 @@ warn_unused_ignores = false - - [[tool.mypy.overrides]] - module = [ -- 'cachecontrol.*', - 'cachy.*', - 'deepdiff.*', - 'httpretty.*', - 'keyring.*', -- 'lockfile.*', - 'pexpect.*', - 'requests_toolbelt.*', - 'shellingham.*', - 'virtualenv.*', - 'xattr.*', -- 'zipp.*', - ] - ignore_missing_imports = true - ---- src/poetry/publishing/uploader.py.orig 2023-05-29 16:05:02 UTC -+++ src/poetry/publishing/uploader.py -@@ -11,17 +11,14 @@ import requests - - from poetry.core.masonry.metadata import Metadata - from poetry.core.masonry.utils.helpers import distribution_name --from requests import adapters - from requests.exceptions import ConnectionError - from requests.exceptions import HTTPError - from requests_toolbelt import user_agent - from requests_toolbelt.multipart import MultipartEncoder - from requests_toolbelt.multipart import MultipartEncoderMonitor --from urllib3 import util - - from poetry.__version__ import __version__ - from poetry.utils.constants import REQUESTS_TIMEOUT --from poetry.utils.constants import STATUS_FORCELIST - from poetry.utils.patterns import wheel_file_re - - -@@ -64,18 +61,6 @@ class Uploader: - return agent - - @property -- def adapter(self) -> adapters.HTTPAdapter: -- retry = util.Retry( -- connect=5, -- total=10, -- allowed_methods=["GET"], -- respect_retry_after_header=True, -- status_forcelist=STATUS_FORCELIST, -- ) -- -- return adapters.HTTPAdapter(max_retries=retry) -- -- @property - def files(self) -> list[Path]: - dist = self._poetry.file.path.parent / "dist" - version = self._package.version.to_string() -@@ -97,9 +82,6 @@ class Uploader: - session.auth = auth - - session.headers["User-Agent"] = self.user_agent -- for scheme in ("http://", "https://"): -- session.mount(scheme, self.adapter) -- - return session - - def get_auth(self) -> tuple[str, str] | None: ---- src/poetry/utils/authenticator.py.orig 2023-05-29 16:05:02 UTC -+++ src/poetry/utils/authenticator.py -@@ -12,14 +12,12 @@ from pathlib import Path - from typing import TYPE_CHECKING - from typing import Any - --import lockfile - import requests - import requests.auth - import requests.exceptions - - from cachecontrol import CacheControlAdapter - from cachecontrol.caches import FileCache --from filelock import FileLock - - from poetry.config.config import Config - from poetry.exceptions import PoetryException -@@ -37,26 +35,6 @@ if TYPE_CHECKING: - logger = logging.getLogger(__name__) - - --class FileLockLockFile(lockfile.LockBase): # type: ignore[misc] -- # The default LockFile from the lockfile package as used by cachecontrol can remain -- # locked if a process exits ungracefully. See eg -- # <https://github.com/python-poetry/poetry/issues/6030#issuecomment-1189383875>. -- # -- # FileLock from the filelock package does not have this problem, so we use that to -- # construct something compatible with cachecontrol. -- def __init__( -- self, path: str, threaded: bool = True, timeout: float | None = None -- ) -> None: -- super().__init__(path, threaded, timeout) -- self.file_lock = FileLock(self.lock_file) -- -- def acquire(self, timeout: float | None = None) -> None: -- self.file_lock.acquire(timeout=timeout) -- -- def release(self) -> None: -- self.file_lock.release() -- -- - @dataclasses.dataclass(frozen=True) - class RepositoryCertificateConfig: - cert: Path | None = dataclasses.field(default=None) -@@ -148,7 +126,6 @@ class Authenticator: - / (cache_id or "_default_cache") - / "_http" - ), -- lock_class=FileLockLockFile, - ) - if not disable_cache - else None diff --git a/devel/py-poetry/files/patch-pyproject.toml b/devel/py-poetry/files/patch-pyproject.toml new file mode 100644 index 000000000000..53175b20eac1 --- /dev/null +++ b/devel/py-poetry/files/patch-pyproject.toml @@ -0,0 +1,11 @@ +--- pyproject.toml.orig 2023-08-21 17:52:54 UTC ++++ pyproject.toml +@@ -43,7 +43,7 @@ importlib-metadata = { version = ">=4.4", python = "<3 + installer = "^0.7.0" + # jsonschema 4.18 uses Rust-based libraries which causes issues when building from source + jsonschema = ">=4.10.0,<4.18.0" +-keyring = "^24.0.0" ++keyring = ">=23.9.0,<25" + # packaging uses calver, so version is unclamped + packaging = ">=20.4" + pexpect = "^4.7.0"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308260930.37Q9UmoT089987>