Date: Wed, 18 Dec 2019 04:52:14 +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: r520358 - in head/textproc/py-chardet: . files Message-ID: <201912180452.xBI4qEHD006931@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Wed Dec 18 04:52:14 2019 New Revision: 520358 URL: https://svnweb.freebsd.org/changeset/ports/520358 Log: textproc/py-charset: Fix test target Fix test invocation with pytest 4.x [1], which was failing with: if len(param.values) != len(argnames): E TypeError: object of type 'MarkDecorator' has no len() While here, fix out of order MASTER_SITES [1] https://github.com/chardet/chardet/pull/174 Approved by: portmgr (blanket: ports compliance) MFH: 2019Q4 (blanket(s): bugfix, ports compliance) Added: head/textproc/py-chardet/files/ head/textproc/py-chardet/files/patch-test.py (contents, props changed) Modified: head/textproc/py-chardet/Makefile Modified: head/textproc/py-chardet/Makefile ============================================================================== --- head/textproc/py-chardet/Makefile Wed Dec 18 02:32:48 2019 (r520357) +++ head/textproc/py-chardet/Makefile Wed Dec 18 04:52:14 2019 (r520358) @@ -3,10 +3,10 @@ PORTNAME= chardet PORTVERSION= 3.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= rm@FreeBSD.org COMMENT= Universal encoding detector for Python 2 and 3 Added: head/textproc/py-chardet/files/patch-test.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/py-chardet/files/patch-test.py Wed Dec 18 04:52:14 2019 (r520358) @@ -0,0 +1,16 @@ +From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> +Date: Tue, 12 Mar 2019 18:44:36 +0100 +Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters + +Fixes https://github.com/chardet/chardet/issues/173 + +--- test.py.orig 2019-12-18 03:03:28 UTC ++++ test.py +@@ -59,7 +59,7 @@ def gen_test_params(): + full_path = join(path, file_name) + test_case = full_path, encoding + if full_path in EXPECTED_FAILURES: +- test_case = pytest.mark.xfail(test_case) ++ test_case = pytest.param(*test_case, marks=pytest.mark.xfail) + yield test_case
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912180452.xBI4qEHD006931>