pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/py-raven py-raven: improve test situation



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd42e2e24ba1
branches:  trunk
changeset: 372568:fd42e2e24ba1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jan 27 10:16:09 2022 +0000

description:
py-raven: improve test situation

diffstat:

 www/py-raven/Makefile                  |   4 ++--
 www/py-raven/distinfo                  |   3 ++-
 www/py-raven/patches/patch-conftest.py |  14 ++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r b0a4b916884d -r fd42e2e24ba1 www/py-raven/Makefile
--- a/www/py-raven/Makefile     Thu Jan 27 10:06:38 2022 +0000
+++ b/www/py-raven/Makefile     Thu Jan 27 10:16:09 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:30 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/27 10:16:09 wiz Exp $
 
 DISTNAME=      raven-6.10.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -38,7 +38,6 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.18.2:../../devel/py-test-xdist
 TEST_DEPENDS+= ${PYPKGPREFIX}-tornado>=4.1:../../www/py-tornado
 TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
-TEST_DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
 TEST_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 TEST_DEPENDS+= ${PYPKGPREFIX}-zconfig-[0-9]*:../../devel/py-zconfig
 
@@ -50,6 +49,7 @@
 .if ${PYPKGPREFIX} == py27
 DEPENDS+=      ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2
 TEST_DEPENDS=  # none; py-aiohttp and py-sanic are incompatible with py27
+TEST_DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
 do-test:
 .endif
 
diff -r b0a4b916884d -r fd42e2e24ba1 www/py-raven/distinfo
--- a/www/py-raven/distinfo     Thu Jan 27 10:06:38 2022 +0000
+++ b/www/py-raven/distinfo     Thu Jan 27 10:16:09 2022 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:30:46 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/01/27 10:16:09 wiz Exp $
 
 BLAKE2s (raven-6.10.0.tar.gz) = 6176d427fd2a54438c40e861526cd702f790f9aaa563df0883bac7315069c3ef
 SHA512 (raven-6.10.0.tar.gz) = 37ca6d5953dc92b57b3bf4e2edb3947d41f33711d9babfc9eafb8712dc5923829f8810e5123e63749710aeecceb66e56bf8b5b60868f61d750704e20add3c747
 Size (raven-6.10.0.tar.gz) = 288902 bytes
+SHA1 (patch-conftest.py) = 258b45cb148b7297111dc61fe714709b9174660e
 SHA1 (patch-setup.py) = 50da85fcaa001d2d050ec8caf4f9b9792d9da89d
diff -r b0a4b916884d -r fd42e2e24ba1 www/py-raven/patches/patch-conftest.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/py-raven/patches/patch-conftest.py    Thu Jan 27 10:16:09 2022 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-conftest.py,v 1.1 2022/01/27 10:16:09 wiz Exp $
+
+get_marker has been renamed to get_closest_marker.
+
+--- conftest.py.orig   2018-12-15 19:00:21.000000000 +0000
++++ conftest.py
+@@ -74,6 +74,6 @@ def user_instance(request, admin_user):
+ 
+ @pytest.fixture(autouse=True)
+ def has_git_requirements(request, project_root):
+-    if request.node.get_marker('has_git_requirements'):
++    if request.node.get_closest_marker('has_git_requirements'):
+         if not os.path.exists(os.path.join(project_root, '.git', 'refs', 'heads', 'master')):
+             pytest.skip('skipped test as project is not a git repo')



Home | Main Index | Thread Index | Old Index