Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Jun 2020 06:01:26 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r539325 - in head/sysutils/py-diffoscope: . files
Message-ID:  <202006160601.05G61QIt019285@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Tue Jun 16 06:01:26 2020
New Revision: 539325
URL: https://svnweb.freebsd.org/changeset/ports/539325

Log:
  sysutils/py-diffoscope: Update to 147
  
   - Add upstream [1] patch to prevent tlsh dependent tests from failing
  
  Changelog:
  
  145: https://lists.reproducible-builds.org/pipermail/rb-general/2020-May/001947.html
  146: https://lists.reproducible-builds.org/pipermail/rb-general/2020-May/001948.html
  147: https://lists.reproducible-builds.org/pipermail/rb-general/2020-June/001964.html
  
  [1] https://lists.reproducible-builds.org/pipermail/diffoscope/2020-June/002642.html
  
  PR:		246773
  Submitted by:	Fabian Keil <fk fabiankeil de>
  MFH:		No (combined feature/bugfix releases)

Added:
  head/sysutils/py-diffoscope/files/
  head/sysutils/py-diffoscope/files/patch-diffoscope_main.py   (contents, props changed)
Modified:
  head/sysutils/py-diffoscope/Makefile
  head/sysutils/py-diffoscope/distinfo

Modified: head/sysutils/py-diffoscope/Makefile
==============================================================================
--- head/sysutils/py-diffoscope/Makefile	Tue Jun 16 05:58:55 2020	(r539324)
+++ head/sysutils/py-diffoscope/Makefile	Tue Jun 16 06:01:26 2020	(r539325)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	diffoscope
-PORTVERSION=	144
+PORTVERSION=	147
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Modified: head/sysutils/py-diffoscope/distinfo
==============================================================================
--- head/sysutils/py-diffoscope/distinfo	Tue Jun 16 05:58:55 2020	(r539324)
+++ head/sysutils/py-diffoscope/distinfo	Tue Jun 16 06:01:26 2020	(r539325)
@@ -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

Added: head/sysutils/py-diffoscope/files/patch-diffoscope_main.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-diffoscope/files/patch-diffoscope_main.py	Tue Jun 16 06:01:26 2020	(r539325)
@@ -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.'
+         )



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