git: 454ff041f856 - main - devel/py-poetry: Update to 1.7.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 21 Feb 2024 15:23:33 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=454ff041f856f0bbd17e065af54d52df84af32ef
commit 454ff041f856f0bbd17e065af54d52df84af32ef
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-02-21 14:42:30 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-02-21 15:07:37 +0000
devel/py-poetry: Update to 1.7.1
- Add GitHub to MASTER_SITES
- Add FILECACHE option
- Bump PORTREVISION for incorrect 1034b67935210a4521d99862c6043180e662423b
Changes: https://github.com/python-poetry/poetry/releases
---
devel/py-poetry/Makefile | 27 +++++++++++++++++----------
devel/py-poetry/distinfo | 6 +++---
devel/py-poetry/files/patch-pyproject.toml | 18 +++++++++++++-----
3 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile
index 5e39ffd5cd0e..4b53ecc92e9a 100644
--- a/devel/py-poetry/Makefile
+++ b/devel/py-poetry/Makefile
@@ -1,7 +1,9 @@
PORTNAME= poetry
-PORTVERSION= 1.6.1
+PORTVERSION= 1.7.1
+PORTREVISION= 1
CATEGORIES= devel python
-MASTER_SITES= PYPI
+MASTER_SITES= PYPI \
+ https://github.com/python-poetry/poetry/releases/download/${PORTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sunpoet@FreeBSD.org
@@ -13,27 +15,26 @@ 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>=0.10.0<0.11:devel/py-build@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.13.0<0.14:www/py-cachecontrol@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}cleo>=2.0.0<3:devel/py-cleo@${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}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}packaging>=20.5: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.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}poetry-core>=1.8.1<1.8.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>=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} \
${PYTHON_PKGNAMEPREFIX}trove-classifiers>=2022.5.19:devel/py-trove-classifiers@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}virtualenv>=20.22.0<21:devel/py-virtualenv@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}virtualenv>=20.23.0<21:devel/py-virtualenv@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent pep517
@@ -41,6 +42,12 @@ USE_PYTHON= autoplist concurrent pep517
BINARY_ALIAS= git=false
NO_ARCH= yes
+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 d0b7c74914f5..bd05e0e48870 100644
--- a/devel/py-poetry/distinfo
+++ b/devel/py-poetry/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692812418
-SHA256 (poetry-1.6.1.tar.gz) = 0ab9b1a592731cc8b252b8d6aaeea19c72cc0a109d7468b829ad57e6c48039d2
-SIZE (poetry-1.6.1.tar.gz) = 1475487
+TIMESTAMP = 1708449286
+SHA256 (poetry-1.7.1.tar.gz) = b348a70e7d67ad9c0bd3d0ea255bc6df84c24cf4b16f8d104adb30b425d6ff32
+SIZE (poetry-1.7.1.tar.gz) = 1483927
diff --git a/devel/py-poetry/files/patch-pyproject.toml b/devel/py-poetry/files/patch-pyproject.toml
index 53175b20eac1..e369ee58f1f5 100644
--- a/devel/py-poetry/files/patch-pyproject.toml
+++ b/devel/py-poetry/files/patch-pyproject.toml
@@ -1,11 +1,19 @@
---- pyproject.toml.orig 2023-08-21 17:52:54 UTC
+--- pyproject.toml.orig 2023-11-16 19:08:40 UTC
+++ pyproject.toml
-@@ -43,7 +43,7 @@ importlib-metadata = { version = ">=4.4", python = "<3
+@@ -35,14 +35,14 @@ build = "^1.0.3"
+ poetry-core = "1.8.1"
+ poetry-plugin-export = "^1.6.0"
+ build = "^1.0.3"
+-cachecontrol = { version = "^0.13.0", extras = ["filecache"] }
++cachecontrol = { version = "^0.14.0", extras = ["filecache"] }
+ cleo = "^2.1.0"
+ crashtest = "^0.4.1"
+ dulwich = "^0.21.2"
+ fastjsonschema = "^2.18.0"
+ importlib-metadata = { version = ">=4.4", python = "<3.10" }
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"
+ packaging = ">=20.5"
pexpect = "^4.7.0"