CVS commit: pkgsrc/devel/py-mercurial

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 12 10:39:06 UTC 2023

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-tests_run-tests.py

Log Message:
py-mercurial: get rid of unneeded test dependency using upstream patch


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.127 -r1.128 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/py-mercurial/patches/patch-tests_run-tests.py

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

Modified files:

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.79 pkgsrc/devel/py-mercurial/Makefile:1.80
--- pkgsrc/devel/py-mercurial/Makefile:1.79     Wed Mar 29 11:29:27 2023
+++ pkgsrc/devel/py-mercurial/Makefile  Wed Apr 12 10:39:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2023/03/29 11:29:27 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2023/04/12 10:39:06 wiz Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -17,8 +17,6 @@ DEPENDS+=     ${PYPKGPREFIX}-curses-[0-9]*:.
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-# https://bz.mercurial-scm.org/show_bug.cgi?id=6805
-TEST_DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 
 USE_TOOLS+=    gmake msgfmt
 

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.127 pkgsrc/devel/py-mercurial/distinfo:1.128
--- pkgsrc/devel/py-mercurial/distinfo:1.127    Wed Mar 29 11:29:27 2023
+++ pkgsrc/devel/py-mercurial/distinfo  Wed Apr 12 10:39:06 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.127 2023/03/29 11:29:27 wiz Exp $
+$NetBSD: distinfo,v 1.128 2023/04/12 10:39:06 wiz Exp $
 
 BLAKE2s (mercurial-6.4.tar.gz) = 5d243db3df70d23144ec1dcf97684299d4d6f7ed60105000a37849c395698fdd
 SHA512 (mercurial-6.4.tar.gz) = a7810eddd0fd2a331215a5f7e9c81df4d860cf695aec3c5e3984821827b5427b5a01b68c07b9711e86db2f9b0ef5b5d3d6251a7dc76f99375c457920ce36c96f
 Size (mercurial-6.4.tar.gz) = 8169322 bytes
+SHA1 (patch-tests_run-tests.py) = 71830d075db9f6ed729ead0ec6be075d44fb2b95
 SHA1 (patch-tests_test-revlog-delta-find.t) = 4af19d6ece17d0aa12ce504fcdd1662812d993cb

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-tests_run-tests.py
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-tests_run-tests.py:1.3
--- /dev/null   Wed Apr 12 10:39:06 2023
+++ pkgsrc/devel/py-mercurial/patches/patch-tests_run-tests.py  Wed Apr 12 10:39:06 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-tests_run-tests.py,v 1.3 2023/04/12 10:39:06 wiz Exp $
+
+https://bz.mercurial-scm.org/show_bug.cgi?id=6805
+https://www.mercurial-scm.org/repo/hg/rev/787e7caf887a
+
+--- tests/run-tests.py.orig    2023-03-23 23:11:29.000000000 +0000
++++ tests/run-tests.py
+@@ -54,7 +54,6 @@ import functools
+ import json
+ import multiprocessing
+ import os
+-import packaging.version as version
+ import platform
+ import queue
+ import random
+@@ -794,9 +793,7 @@ def parseargs(args, parser):
+         try:
+             import coverage
+ 
+-            covver = version.Version(coverage.__version__)
+-            if covver < version.Version("3.3"):
+-                parser.error('coverage options require coverage 3.3 or later')
++            coverage.__version__  # silence unused import warning
+         except ImportError:
+             parser.error('coverage options now require the coverage package')
+