CVS commit: pkgsrc/www/py-raven

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 27 10:16:10 UTC 2022

Modified Files:
        pkgsrc/www/py-raven: Makefile distinfo
Added Files:
        pkgsrc/www/py-raven/patches: patch-conftest.py

Log Message:
py-raven: improve test situation


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/py-raven/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/py-raven/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/py-raven/patches/patch-conftest.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/py-raven/Makefile
diff -u pkgsrc/www/py-raven/Makefile:1.12 pkgsrc/www/py-raven/Makefile:1.13
--- pkgsrc/www/py-raven/Makefile:1.12   Wed Jan  5 15:41:30 2022
+++ pkgsrc/www/py-raven/Makefile        Thu Jan 27 10:16:09 2022
@@ -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-timeo
 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 @@ USE_PKG_RESOURCES=    yes
 .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
 

Index: pkgsrc/www/py-raven/distinfo
diff -u pkgsrc/www/py-raven/distinfo:1.10 pkgsrc/www/py-raven/distinfo:1.11
--- pkgsrc/www/py-raven/distinfo:1.10   Tue Oct 26 11:30:46 2021
+++ pkgsrc/www/py-raven/distinfo        Thu Jan 27 10:16:09 2022
@@ -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

Added files:

Index: pkgsrc/www/py-raven/patches/patch-conftest.py
diff -u /dev/null pkgsrc/www/py-raven/patches/patch-conftest.py:1.1
--- /dev/null   Thu Jan 27 10:16:10 2022
+++ pkgsrc/www/py-raven/patches/patch-conftest.py       Thu Jan 27 10:16:09 2022
@@ -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')