diff options
Diffstat (limited to 'devel/py-poetry')
| -rw-r--r-- | devel/py-poetry/Makefile | 12 | ||||
| -rw-r--r-- | devel/py-poetry/distinfo | 6 | ||||
| -rw-r--r-- | devel/py-poetry/files/patch-pyproject.toml | 18 | ||||
| -rw-r--r-- | devel/py-poetry/files/patch-virtualenv | 25 |
4 files changed, 43 insertions, 18 deletions
diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile index 28b9aec01c85..59fb287d23ce 100644 --- a/devel/py-poetry/Makefile +++ b/devel/py-poetry/Makefile @@ -1,5 +1,5 @@ PORTNAME= poetry -PORTVERSION= 2.1.2 +PORTVERSION= 2.1.4 CATEGORIES= devel python MASTER_SITES= PYPI \ https://github.com/python-poetry/poetry/releases/download/${PORTVERSION}/ @@ -19,14 +19,14 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=1.2.1<2.0.0:devel/py-build@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}cleo>=2.1.0<3.0.0:devel/py-cleo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.22.6<0.23.0:devel/py-dulwich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fastjsonschema>=2.18.0<3.0.0:devel/py-fastjsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}findpython>=0.6.2<0.7.0:devel/py-findpython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}findpython>=0.6.2:devel/py-findpython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}installer>=0.7.0<0.8.0:devel/py-installer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keyring>=23.9.0,1<26.0.0,1:security/py-keyring@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keyring>=25.1.0,1<26.0.0,1:security/py-keyring@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=24.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbs-installer>=2025.1.6<2026.0.0:devel/py-pbs-installer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.12<2.0:sysutils/py-pkginfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=3.0.0<5:devel/py-platformdirs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}poetry-core>=${PORTVERSION}<${PORTVERSION}_99:devel/py-poetry-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}poetry-core>=2.1.3<2.1.3_99:devel/py-poetry-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproject-hooks>=1.0.0<2.0.0:devel/py-pyproject-hooks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.26<3.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=1.0.0<2.0.0:www/py-requests-toolbelt@${PY_FLAVOR} \ @@ -45,7 +45,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=7.2.0:devel/py-coverage@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=3.1,1:devel/py-pytest-xdist@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=0,1<2.3,1:net/py-urllib3@${PY_FLAVOR} -USES= python +USES= python:3.10+ USE_PYTHON= autoplist concurrent pep517 pytest BINARY_ALIAS= git=false @@ -55,7 +55,7 @@ TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} .include <bsd.port.pre.mk> .if ${PYTHON_REL} < 31000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4:devel/py-importlib-metadata@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4<8.7:devel/py-importlib-metadata@${PY_FLAVOR} .endif .include <bsd.port.post.mk> diff --git a/devel/py-poetry/distinfo b/devel/py-poetry/distinfo index d15faac6d2b3..84f683777867 100644 --- a/devel/py-poetry/distinfo +++ b/devel/py-poetry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744288942 -SHA256 (poetry-2.1.2.tar.gz) = 6a0694645ee24ba93cb94254db66e47971344562ddd5578e82bf35e572bc546d -SIZE (poetry-2.1.2.tar.gz) = 3434250 +TIMESTAMP = 1757120708 +SHA256 (poetry-2.1.4.tar.gz) = bed4af5fc87fb145258ac5b1dae77de2cd7082ec494e3b2f66bca0f477cbfc5c +SIZE (poetry-2.1.4.tar.gz) = 3435981 diff --git a/devel/py-poetry/files/patch-pyproject.toml b/devel/py-poetry/files/patch-pyproject.toml index 29be3f10b447..ba954546ba13 100644 --- a/devel/py-poetry/files/patch-pyproject.toml +++ b/devel/py-poetry/files/patch-pyproject.toml @@ -1,11 +1,11 @@ --- pyproject.toml.orig 1970-01-01 00:00:00 UTC +++ pyproject.toml -@@ -12,7 +12,7 @@ dependencies = [ - "fastjsonschema (>=2.18.0,<3.0.0)", - "importlib-metadata (>=4.4) ; python_version < '3.10'", - "installer (>=0.7.0,<0.8.0)", -- "keyring (>=25.1.0,<26.0.0)", -+ "keyring (>=23.9.0,<26.0.0)", - # packaging uses calver, so version is unclamped - "packaging (>=24.0)", - "pkginfo (>=1.12,<2.0)", +@@ -29,7 +29,7 @@ dependencies = [ + "trove-classifiers (>=2022.5.19)", + "virtualenv (>=20.26.6,<21.0.0)", + "xattr (>=1.0.0,<2.0.0) ; sys_platform == 'darwin'", +- "findpython (>=0.6.2,<0.7.0)", ++ "findpython (>=0.6.2)", + "pbs-installer[download,install] (>=2025.1.6,<2026.0.0)", + ] + authors = [ diff --git a/devel/py-poetry/files/patch-virtualenv b/devel/py-poetry/files/patch-virtualenv new file mode 100644 index 000000000000..7c944365b029 --- /dev/null +++ b/devel/py-poetry/files/patch-virtualenv @@ -0,0 +1,25 @@ +Obtained from: https://github.com/python-poetry/poetry/commit/9f276d3dab71ba741107a5a7f4efc12fdda5cb0b + +--- pyproject.toml.orig 1970-01-01 00:00:00 UTC ++++ pyproject.toml +@@ -27,8 +27,7 @@ dependencies = [ + "tomlkit (>=0.11.4,<1.0.0)", + # trove-classifiers uses calver, so version is unclamped + "trove-classifiers (>=2022.5.19)", +- # upper pin as quickfix for https://github.com/python-poetry/poetry/issues/10490 +- "virtualenv (>=20.26.6,<20.33.0)", ++ "virtualenv (>=20.26.6)", + "xattr (>=1.0.0,<2.0.0) ; sys_platform == 'darwin'", + "findpython (>=0.6.2,<0.7.0)", + "pbs-installer[download,install] (>=2025.1.6,<2026.0.0)", +--- src/poetry/utils/env/env_manager.py.orig 1970-01-01 00:00:00 UTC ++++ src/poetry/utils/env/env_manager.py +@@ -532,7 +532,7 @@ class EnvManager: + args = [ + "--no-download", + "--no-periodic-update", +- "--try-first-with", ++ "--python", + executable_str or sys.executable, + ] + |