Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Oct 2022 15:11:19 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 00268359bcd9 - 2022Q4 - misc/py-dictdiffer: Fix build
Message-ID:  <202210081511.298FBJsZ021936@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=00268359bcd94c574829d58fe9722fec4bf23917

commit 00268359bcd94c574829d58fe9722fec4bf23917
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-10-05 03:11:51 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-10-08 15:11:16 +0000

    misc/py-dictdiffer: Fix build
    
    Python version comparison procedure thinks that
    the version 2.7 is greater than 6.0.0 for some reason.
    
    (cherry picked from commit 089cd58ec806c6e6f7a22ab269f90401d77889b1)
---
 misc/py-dictdiffer/Makefile             |  4 ++--
 misc/py-dictdiffer/files/patch-setup.py | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/misc/py-dictdiffer/Makefile b/misc/py-dictdiffer/Makefile
index 215a005b4c29..14843ac0277c 100644
--- a/misc/py-dictdiffer/Makefile
+++ b/misc/py-dictdiffer/Makefile
@@ -11,8 +11,8 @@ WWW=		https://github.com/inveniosoftware/dictdiffer
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.7:devel/py-pytest-runner@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.1.0:devel/py-setuptools_scm@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
diff --git a/misc/py-dictdiffer/files/patch-setup.py b/misc/py-dictdiffer/files/patch-setup.py
new file mode 100644
index 000000000000..1c2800241c52
--- /dev/null
+++ b/misc/py-dictdiffer/files/patch-setup.py
@@ -0,0 +1,13 @@
+- fix the problem that Python thinks that the version 2.7 is greater than 6.0.0 for pytest-runner
+
+--- setup.py.orig	2022-10-04 20:58:57 UTC
++++ setup.py
+@@ -54,7 +54,7 @@ for key, reqs in extras_require.items():
+     extras_require['all'].extend(reqs)
+ 
+ setup_requires = [
+-    'pytest-runner>=2.7',
++    'pytest-runner',
+     'setuptools_scm>=3.1.0',
+ ]
+ 



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