Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 11 Nov 2025 07:20:19 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 74e2b53f7f5b - main - devel/commitizen: Fix *_DEPENDS: Remove superfluous py-prompt-toolkit
Message-ID:  <202511110720.5AB7KJ3x096209@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=74e2b53f7f5b68073846b9f08ae425ece8361270

commit 74e2b53f7f5b68073846b9f08ae425ece8361270
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-11-11 07:13:30 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-11-11 07:17:10 +0000

    devel/commitizen: Fix *_DEPENDS: Remove superfluous py-prompt-toolkit
    
    - Update version requirement of *_DEPENDS
    - Fix *_DEPENDS usage
    - Add missing PKGNAMESUFFIX
    - Bump PORTREVISION for dependency and package change
    
    PR:             290590
    Approved by:    maintainer (timeout, 14 days)
---
 devel/commitizen/Makefile                   | 36 +++++++++++++++--------------
 devel/commitizen/files/patch-pyproject.toml | 17 ++++++++++++++
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/devel/commitizen/Makefile b/devel/commitizen/Makefile
index 42cff50d24ed..e1dafd70186e 100644
--- a/devel/commitizen/Makefile
+++ b/devel/commitizen/Makefile
@@ -1,7 +1,9 @@
 PORTNAME=	commitizen
 PORTVERSION=	3.31.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
+PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Commitizen client tool written in Python
@@ -10,28 +12,28 @@ WWW=		https://commitizen-tools.github.io/commitizen/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PY_BDEPS=	poetry-core>0:devel/py-poetry-core
-PY_RDEPS=	Jinja2>=2.10.3:devel/py-Jinja2 \
-		argcomplete>=1.12.1:devel/py-argcomplete \
-		charset-normalizer>=2.1.0:textproc/py-charset-normalizer \
-		colorama>=0.4.1:devel/py-colorama \
-		decli>=0.6.0:devel/py-decli \
-		packaging>=19:devel/py-packaging \
-		pyyaml>=3.08:devel/py-pyyaml \
-		prompt-toolkit>0:devel/py-prompt-toolkit \
-		questionary>=2.0:devel/py-questionary \
-		termcolor>=1.1:devel/py-termcolor \
-		tomlkit>=0.5.3:textproc/py-tomlkit
-BUILD_DEPENDS=	${PY_BDEPS:S,^,${PYTHON_PKGNAMEPREFIX},:S,$,@${PY_FLAVOR},}
-RUN_DEPENDS=	${PY_RDEPS:S,^,${PYTHON_PKGNAMEPREFIX},:S,$,@${PY_FLAVOR},}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=1.12.1:devel/py-argcomplete@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2.1.0<4:textproc/py-charset-normalizer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.4.1<0.5:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}decli>=0.6.0<0.7:devel/py-decli@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=8.0.0<9:devel/py-importlib-metadata@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.3:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=19:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=3.08:devel/py-pyyaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}questionary>=2.0<3:devel/py-questionary@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1:devel/py-termcolor@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tomlkit>=0.5.3<1.0.0:textproc/py-tomlkit@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
 
-.if ${PYTHON_MAJOR_VER} == 3 && ${PYTHON_VER:E} < 10
-PY_RDEPS+=	importlib-metadata>=8.0.0:devel/py-importlib-metadata
+.if ${PYTHON_REL} < 31000
+RUN_DEPENDS+=	importlib-metadata>=8.0.0<9:devel/py-importlib-metadata
 .endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/commitizen/files/patch-pyproject.toml b/devel/commitizen/files/patch-pyproject.toml
new file mode 100644
index 000000000000..13ca9f775e91
--- /dev/null
+++ b/devel/commitizen/files/patch-pyproject.toml
@@ -0,0 +1,17 @@
+--- pyproject.toml.orig	2024-11-16 07:59:21 UTC
++++ pyproject.toml
+@@ -42,12 +42,12 @@ colorama = "^0.4.1"
+ questionary = "^2.0"
+ decli = "^0.6.0"
+ colorama = "^0.4.1"
+-termcolor = ">= 1.1, < 3"
++termcolor = ">= 1.1"
+ packaging = ">=19"
+ tomlkit = ">=0.5.3,<1.0.0"
+ jinja2 = ">=2.10.3"
+ pyyaml = ">=3.08"
+-argcomplete = ">=1.12.1,<3.6"
++argcomplete = ">=1.12.1"
+ typing-extensions = { version = "^4.0.1", python = "<3.8" }
+ charset-normalizer = ">=2.1.0,<4"
+ # Use the Python 3.11 and 3.12 compatible API: https://github.com/python/importlib_metadata#compatibility
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511110720.5AB7KJ3x096209>