summaryrefslogtreecommitdiff
path: root/devel/py-poetry
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--devel/py-poetry-core/Makefile2
-rw-r--r--devel/py-poetry-core/distinfo6
-rw-r--r--devel/py-poetry/Makefile15
-rw-r--r--devel/py-poetry/distinfo6
-rw-r--r--devel/py-poetry/files/patch-dulwich65
-rw-r--r--devel/py-poetry/files/patch-pyproject.toml11
-rw-r--r--devel/py-poetry/files/patch-virtualenv25
7 files changed, 14 insertions, 116 deletions
diff --git a/devel/py-poetry-core/Makefile b/devel/py-poetry-core/Makefile
index 083242b65370..06df63ff836a 100644
--- a/devel/py-poetry-core/Makefile
+++ b/devel/py-poetry-core/Makefile
@@ -1,5 +1,5 @@
PORTNAME= poetry-core
-PORTVERSION= 2.1.3
+PORTVERSION= 2.2.1
CATEGORIES= devel python
MASTER_SITES= PYPI \
https://github.com/python-poetry/poetry-core/releases/download/${PORTVERSION}/
diff --git a/devel/py-poetry-core/distinfo b/devel/py-poetry-core/distinfo
index ce86367a193f..12bcf5d22441 100644
--- a/devel/py-poetry-core/distinfo
+++ b/devel/py-poetry-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747546542
-SHA256 (poetry_core-2.1.3.tar.gz) = 0522a015477ed622c89aad56a477a57813cace0c8e7ff2a2906b7ef4a2e296a4
-SIZE (poetry_core-2.1.3.tar.gz) = 365027
+TIMESTAMP = 1759816658
+SHA256 (poetry_core-2.2.1.tar.gz) = 97e50d8593c8729d3f49364b428583e044087ee3def1e010c6496db76bd65ac5
+SIZE (poetry_core-2.2.1.tar.gz) = 378867
diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile
index 1c519ceb49b5..24b3af4f3415 100644
--- a/devel/py-poetry/Makefile
+++ b/devel/py-poetry/Makefile
@@ -1,6 +1,5 @@
PORTNAME= poetry
-PORTVERSION= 2.1.4
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= devel python
MASTER_SITES= PYPI \
https://github.com/python-poetry/poetry/releases/download/${PORTVERSION}/
@@ -20,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.24.0<0.25.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:devel/py-findpython@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}findpython>=0.6.2<0.8.0:devel/py-findpython@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}installer>=0.7.0<0.8.0:devel/py-installer@${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}packaging>=24.2: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>=2.1.3<2.1.3_99:devel/py-poetry-core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}poetry-core>=${PORTVERSION}<${PORTVERSION}_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} \
@@ -35,7 +34,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=1.2.1<2.0.0:devel/py-build@${PY_FLAVO
${PY_TOMLI} \
${PYTHON_PKGNAMEPREFIX}tomlkit>=0.11.4<1.0.0:textproc/py-tomlkit@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}trove-classifiers>=2022.5.19:devel/py-trove-classifiers@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}virtualenv>=20.26.6<21.0.0:devel/py-virtualenv@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}virtualenv>=20.26.6:devel/py-virtualenv@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=7.2.0:devel/py-coverage@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}deepdiff>=6.3:devel/py-deepdiff@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}httpretty>=1.1:www/py-httpretty@${PY_FLAVOR} \
@@ -46,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:3.10+
+USES= python
USE_PYTHON= autoplist concurrent pep517 pytest
BINARY_ALIAS= git=false
@@ -56,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<8.7:devel/py-importlib-metadata@${PY_FLAVOR}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4: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 84f683777867..3c3b004f8a50 100644
--- a/devel/py-poetry/distinfo
+++ b/devel/py-poetry/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1757120708
-SHA256 (poetry-2.1.4.tar.gz) = bed4af5fc87fb145258ac5b1dae77de2cd7082ec494e3b2f66bca0f477cbfc5c
-SIZE (poetry-2.1.4.tar.gz) = 3435981
+TIMESTAMP = 1759816656
+SHA256 (poetry-2.2.1.tar.gz) = bef9aa4bb00ce4c10b28b25e7bac724094802d6958190762c45df6c12749b37c
+SIZE (poetry-2.2.1.tar.gz) = 3441978
diff --git a/devel/py-poetry/files/patch-dulwich b/devel/py-poetry/files/patch-dulwich
deleted file mode 100644
index cbb8acb9209b..000000000000
--- a/devel/py-poetry/files/patch-dulwich
+++ /dev/null
@@ -1,65 +0,0 @@
-Obtained from: https://github.com/python-poetry/poetry/commit/68ea7c862b9ab14ea4644a9d4f12b10c496ba85f
-
---- pyproject.toml.orig 1970-01-01 00:00:00 UTC
-+++ pyproject.toml
-@@ -8,7 +8,7 @@ dependencies = [
- "build (>=1.2.1,<2.0.0)",
- "cachecontrol[filecache] (>=0.14.0,<0.15.0)",
- "cleo (>=2.1.0,<3.0.0)",
-- "dulwich (>=0.22.6,<0.23.0)",
-+ "dulwich (>=0.24.0,<0.25.0)",
- "fastjsonschema (>=2.18.0,<3.0.0)",
- # <8.7 because .metadata() (and Distribution.metadata) can now return None,
- # which requires some adaptions to our code.
---- src/poetry/vcs/git/backend.py.orig 1970-01-01 00:00:00 UTC
-+++ src/poetry/vcs/git/backend.py
-@@ -355,7 +355,7 @@ class Git:
-
- try:
- with local:
-- local.reset_index()
-+ local.get_worktree().reset_index()
- except (AssertionError, KeyError) as e:
- # this implies the ref we need does not exist or is invalid
- if isinstance(e, KeyError):
---- tests/vcs/git/conftest.py.orig 1970-01-01 00:00:00 UTC
-+++ tests/vcs/git/conftest.py
-@@ -16,12 +16,13 @@ def temp_repo(tmp_path: Path) -> TempRepoFixture:
- def temp_repo(tmp_path: Path) -> TempRepoFixture:
- """Temporary repository with 2 commits"""
- repo = dulwich.repo.Repo.init(str(tmp_path))
-+ worktree = repo.get_worktree()
-
- # init commit
- (tmp_path / "foo").write_text("foo", encoding="utf-8")
-- repo.stage(["foo"])
-+ worktree.stage(["foo"])
-
-- init_commit = repo.do_commit(
-+ init_commit = worktree.commit(
- committer=b"User <user@example.com>",
- author=b"User <user@example.com>",
- message=b"init",
-@@ -30,8 +31,8 @@ def temp_repo(tmp_path: Path) -> TempRepoFixture:
-
- # one commit which is not "head"
- (tmp_path / "bar").write_text("bar", encoding="utf-8")
-- repo.stage(["bar"])
-- middle_commit = repo.do_commit(
-+ worktree.stage(["bar"])
-+ middle_commit = worktree.commit(
- committer=b"User <user@example.com>",
- author=b"User <user@example.com>",
- message=b"extra",
-@@ -40,9 +41,9 @@ def temp_repo(tmp_path: Path) -> TempRepoFixture:
-
- # extra commit
- (tmp_path / "third").write_text("third file", encoding="utf-8")
-- repo.stage(["third"])
-+ worktree.stage(["third"])
-
-- head_commit = repo.do_commit(
-+ head_commit = worktree.commit(
- committer=b"User <user@example.com>",
- author=b"User <user@example.com>",
- message=b"extra",
diff --git a/devel/py-poetry/files/patch-pyproject.toml b/devel/py-poetry/files/patch-pyproject.toml
deleted file mode 100644
index ba954546ba13..000000000000
--- a/devel/py-poetry/files/patch-pyproject.toml
+++ /dev/null
@@ -1,11 +0,0 @@
---- pyproject.toml.orig 1970-01-01 00:00:00 UTC
-+++ pyproject.toml
-@@ -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
deleted file mode 100644
index 7c944365b029..000000000000
--- a/devel/py-poetry/files/patch-virtualenv
+++ /dev/null
@@ -1,25 +0,0 @@
-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,
- ]
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-18 05:54:15 +0000