diff options
author | Kubilay Kocak <koobs@FreeBSD.org> | 2020-06-16 06:01:26 +0000 |
---|---|---|
committer | Kubilay Kocak <koobs@FreeBSD.org> | 2020-06-16 06:01:26 +0000 |
commit | e5c7984f39b19574f6fe14b7433645bd5d174d55 (patch) | |
tree | edd3780c12c9c8e66719789485f6d9a9ce49b7f2 /sysutils/py-diffoscope | |
parent | f5c567909cbb257cda6b74285fbde60d62ac392d (diff) | |
download | ports-e5c7984f39b19574f6fe14b7433645bd5d174d55.tar.gz ports-e5c7984f39b19574f6fe14b7433645bd5d174d55.zip |
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)
Notes
Notes:
svn path=/head/; revision=539325
Diffstat (limited to 'sysutils/py-diffoscope')
-rw-r--r-- | sysutils/py-diffoscope/Makefile | 2 | ||||
-rw-r--r-- | sysutils/py-diffoscope/distinfo | 6 | ||||
-rw-r--r-- | sysutils/py-diffoscope/files/patch-diffoscope_main.py | 14 |
3 files changed, 18 insertions, 4 deletions
diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile index 8840142ef652..3d6c0d740f73 100644 --- a/sysutils/py-diffoscope/Makefile +++ b/sysutils/py-diffoscope/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= diffoscope -PORTVERSION= 144 +PORTVERSION= 147 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-diffoscope/distinfo b/sysutils/py-diffoscope/distinfo index 61f300a436c2..fcbbedb9d63e 100644 --- a/sysutils/py-diffoscope/distinfo +++ b/sysutils/py-diffoscope/distinfo @@ -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 diff --git a/sysutils/py-diffoscope/files/patch-diffoscope_main.py b/sysutils/py-diffoscope/files/patch-diffoscope_main.py new file mode 100644 index 000000000000..246b2cac77b0 --- /dev/null +++ b/sysutils/py-diffoscope/files/patch-diffoscope_main.py @@ -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.' + ) |