aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo-Chuan Hsieh <sunpoet@FreeBSD.org>2025-02-03 15:39:40 +0000
committerPo-Chuan Hsieh <sunpoet@FreeBSD.org>2025-02-03 15:54:27 +0000
commitc538c34bc79c0f2eb88ecc88f8c4726421aa705d (patch)
tree48ff4ba41c43e9c66167eb17ea035e5e30f93f45
parent2595dd7e6a4be47a9b04dc4a0eac4d346c856213 (diff)
devel/py-poetry: Update to 2.0.1
- Remove FILECACHE option Changes: https://github.com/python-poetry/poetry/releases
-rw-r--r--devel/py-poetry/Makefile56
-rw-r--r--devel/py-poetry/distinfo6
-rw-r--r--devel/py-poetry/files/patch-pyproject.toml20
3 files changed, 38 insertions, 44 deletions
diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile
index c3f7e2287f48..0e9115767259 100644
--- a/devel/py-poetry/Makefile
+++ b/devel/py-poetry/Makefile
@@ -1,5 +1,5 @@
PORTNAME= poetry
-PORTVERSION= 1.8.5
+PORTVERSION= 2.0.1
CATEGORIES= devel python
MASTER_SITES= PYPI \
https://github.com/python-poetry/poetry/releases/download/${PORTVERSION}/
@@ -13,35 +13,35 @@ WWW= https://python-poetry.org/ \
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.5.0:devel/py-poetry-core@${PY_FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=1.0.3<2:devel/py-build@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cleo>=2.1.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}fastjsonschema>=2.18.0<3:devel/py-fastjsonschema@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}installer>=0.7.0<0.8:devel/py-installer@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}keyring>=23.9.0,1<25,1:security/py-keyring@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}packaging>=23.1:devel/py-packaging@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pexpect>=4.7.0<5:misc/py-pexpect@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.12.0<2:sysutils/py-pkginfo@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=2.0:devel/py-poetry-core@${PY_FLAVOR}
+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}fastjsonschema>=2.18.0<3.0.0:devel/py-fastjsonschema@${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}packaging>=24.0:devel/py-packaging@${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>=1.9.1<1.9.1_99:devel/py-poetry-core@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}poetry-plugin-export>=1.6.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.26<3:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=1.0.0<2:www/py-requests-toolbelt@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}shellingham>=1.5<2:devel/py-shellingham@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}poetry-core>=2.0.1<2.0.1_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} \
+ ${PYTHON_PKGNAMEPREFIX}shellingham>=1.5<2.0:devel/py-shellingham@${PY_FLAVOR} \
${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:devel/py-virtualenv@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}virtualenv>=20.26.6<21.0.0:devel/py-virtualenv@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=7.2.0:devel/py-coverage@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}deepdiff>=6.3<7:devel/py-deepdiff@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}httpretty>=1.1<2:www/py-httpretty@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-cov>=4.0<5:devel/py-pytest-cov@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-mock>=3.9<4:devel/py-pytest-mock@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-randomly>=3.12<4:devel/py-pytest-randomly@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=3.1,1<4,1:devel/py-pytest-xdist@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}deepdiff>=6.3:devel/py-deepdiff@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httpretty>=1.1:www/py-httpretty@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}jaraco.classes>=3.3.1:devel/py-jaraco.classes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=4.0:devel/py-pytest-cov@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>=3.9:devel/py-pytest-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-randomly>=3.12:devel/py-pytest-randomly@${PY_FLAVOR} \
+ ${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
USE_PYTHON= autoplist concurrent pep517 pytest
@@ -50,12 +50,6 @@ BINARY_ALIAS= git=false
NO_ARCH= yes
TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
-OPTIONS_DEFINE= FILECACHE
-OPTIONS_DEFAULT=FILECACHE
-FILECACHE_DESC= File cache support
-
-FILECACHE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.14.0<0.15:www/py-cachecontrol@${PY_FLAVOR}
-
.include <bsd.port.pre.mk>
.if ${PYTHON_REL} < 31000
diff --git a/devel/py-poetry/distinfo b/devel/py-poetry/distinfo
index 2c2e957e473a..222be1040d81 100644
--- a/devel/py-poetry/distinfo
+++ b/devel/py-poetry/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734888254
-SHA256 (poetry-1.8.5.tar.gz) = eb2c88d224f58f36df8f7b36d6c380c07d1001bca28bde620f68fc086e881b70
-SIZE (poetry-1.8.5.tar.gz) = 1519790
+TIMESTAMP = 1738089026
+SHA256 (poetry-2.0.1.tar.gz) = a2987c3162f6ded6db890701a6fc657d2cfcc702e9421ef4c345211c8bffc5d5
+SIZE (poetry-2.0.1.tar.gz) = 2846041
diff --git a/devel/py-poetry/files/patch-pyproject.toml b/devel/py-poetry/files/patch-pyproject.toml
index 6e03557bcd6d..29be3f10b447 100644
--- a/devel/py-poetry/files/patch-pyproject.toml
+++ b/devel/py-poetry/files/patch-pyproject.toml
@@ -1,11 +1,11 @@
---- pyproject.toml.orig 2024-05-08 13:44:40 UTC
+--- pyproject.toml.orig 1970-01-01 00:00:00 UTC
+++ pyproject.toml
-@@ -41,7 +41,7 @@ installer = "^0.7.0"
- fastjsonschema = "^2.18.0"
- importlib-metadata = { version = ">=4.4", python = "<3.10" }
- installer = "^0.7.0"
--keyring = "^24.0.0"
-+keyring = ">=23.9.0,<25"
- # packaging uses calver, so version is unclamped
- packaging = ">=23.1"
- pexpect = "^4.7.0"
+@@ -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)",