Index: head/sysutils/py-diffoscope/Makefile =================================================================== --- head/sysutils/py-diffoscope/Makefile (revision 539324) +++ head/sysutils/py-diffoscope/Makefile (revision 539325) @@ -1,32 +1,32 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= diffoscope -PORTVERSION= 144 +PORTVERSION= 147 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= In-depth comparison of files, archives, and directories LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${PY_FLAVOR} \ gdiff:textproc/diffutils TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ zipinfo:archivers/unzip \ isoinfo:sysutils/cdrkit \ rpm2cpio:archivers/rpm2cpio USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= .include Index: head/sysutils/py-diffoscope/distinfo =================================================================== --- head/sysutils/py-diffoscope/distinfo (revision 539324) +++ head/sysutils/py-diffoscope/distinfo (revision 539325) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589766564 -SHA256 (diffoscope-144.tar.gz) = 9a45464b7b7184fa1ad2af9c52ebac8f00b3dd5dcf9e15dfc00c653c26fcc345 -SIZE (diffoscope-144.tar.gz) = 1569864 +TIMESTAMP = 1592225921 +SHA256 (diffoscope-147.tar.gz) = 5b5fdaa4d900c891b319e4b9a006eb16824a0b61fdbe15e75acbbe35602e2da6 +SIZE (diffoscope-147.tar.gz) = 1570418 Index: head/sysutils/py-diffoscope/files/patch-diffoscope_main.py =================================================================== --- head/sysutils/py-diffoscope/files/patch-diffoscope_main.py (nonexistent) +++ head/sysutils/py-diffoscope/files/patch-diffoscope_main.py (revision 539325) @@ -0,0 +1,14 @@ +# Add a patch from Mattia Rizzolo to prevent tests +# from failing due to the no-tlsh-module warning. + +--- diffoscope/main.py.orig 2020-06-11 11:45:39 UTC ++++ diffoscope/main.py +@@ -658,7 +658,7 @@ def run_diffoscope(parsed_args): + + ProfileManager().setup(parsed_args) + PresenterManager().configure(parsed_args) +- if not tlsh: ++ if not tlsh and "PYTEST_CURRENT_TEST" not in os.environ: + logger.warning( + 'Fuzzy-matching is currently disabled as the "tlsh" module is unavailable.' + ) Property changes on: head/sysutils/py-diffoscope/files/patch-diffoscope_main.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property