summaryrefslogtreecommitdiff
path: root/devel/py-poetry
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--devel/py-poetry/Makefile8
-rw-r--r--devel/py-poetry/distinfo6
-rw-r--r--devel/py-poetry/files/patch-dulwich65
-rw-r--r--devel/py-poetry/files/patch-virtualenv25
4 files changed, 97 insertions, 7 deletions
diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile
index eca1731b9f02..1c519ceb49b5 100644
--- a/devel/py-poetry/Makefile
+++ b/devel/py-poetry/Makefile
@@ -1,6 +1,6 @@
PORTNAME= poetry
-PORTVERSION= 2.1.3
-PORTREVISION= 2
+PORTVERSION= 2.1.4
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= PYPI \
https://github.com/python-poetry/poetry/releases/download/${PORTVERSION}/
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=2.0:devel/py-poetry-core@${PY
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=1.2.1<2.0.0:devel/py-build@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.14.0<0.15.0:www/py-cachecontrol@${PY_FLAVOR} \
${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}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}installer>=0.7.0<0.8.0:devel/py-installer@${PY_FLAVOR} \
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=1.2.1<2.0.0:devel/py-build@${PY_FLAVO
${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} \
diff --git a/devel/py-poetry/distinfo b/devel/py-poetry/distinfo
index ee54a8c7c07a..84f683777867 100644
--- a/devel/py-poetry/distinfo
+++ b/devel/py-poetry/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747546540
-SHA256 (poetry-2.1.3.tar.gz) = f2c9bd6790b19475976d88ea4553bcc3533c0dc73f740edc4fffe9e2add50594
-SIZE (poetry-2.1.3.tar.gz) = 3435640
+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-dulwich b/devel/py-poetry/files/patch-dulwich
new file mode 100644
index 000000000000..cbb8acb9209b
--- /dev/null
+++ b/devel/py-poetry/files/patch-dulwich
@@ -0,0 +1,65 @@
+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-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,
+ ]
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-02 12:44:23 +0000