Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jan 2022 14:13:08 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 82c6311d4ee6 - 2022Q1 - devel/py-jaraco.functools: unbreak egg version after 87dd5acfed55
Message-ID:  <202201241413.20OED83v033334@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=82c6311d4ee6a3380ed0b310d30c1f5eb3cf0b2e

commit 82c6311d4ee6a3380ed0b310d30c1f5eb3cf0b2e
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-24 14:08:45 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-24 14:12:41 +0000

    devel/py-jaraco.functools: unbreak egg version after 87dd5acfed55
    
    $ flexget
    Traceback (most recent call last):
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 568, in _build_master
        ws.require(__requires__)
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 886, in require
        needed = self.resolve(parse_requirements(requirements))
      File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 777, in resolve
        raise VersionConflict(dist, req).with_context(dependent_req)
    pkg_resources.ContextualVersionConflict: (jaraco.functools 0.0.0 (/usr/local/lib/python3.8/site-packages), Requirement.parse('jaraco.functools>=1.20'), {'tempora'})
    
    (cherry picked from commit 99cf88e18192f9aa8aad49c1d5e8923d96db5559)
---
 devel/py-jaraco.functools/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/devel/py-jaraco.functools/Makefile b/devel/py-jaraco.functools/Makefile
index 34fedc1a3f04..576ed0f67f2c 100644
--- a/devel/py-jaraco.functools/Makefile
+++ b/devel/py-jaraco.functools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	jaraco.functools
 PORTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,6 +13,7 @@ COMMENT=	Additional functools for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jaraco.classes>=0:devel/py-jaraco.classes@${PY_FLAVOR} \



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