From owner-svn-ports-all@freebsd.org Wed Dec 18 04:52:15 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2A2C91D3CBA; Wed, 18 Dec 2019 04:52:15 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47d2g30N1Qz49G2; Wed, 18 Dec 2019 04:52:15 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3FD2210EE; Wed, 18 Dec 2019 04:52:14 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBI4qEWn006933; Wed, 18 Dec 2019 04:52:14 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBI4qEHD006931; Wed, 18 Dec 2019 04:52:14 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201912180452.xBI4qEHD006931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Wed, 18 Dec 2019 04:52:14 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: koobs X-SVN-Commit-Paths: in head/textproc/py-chardet: . files X-SVN-Commit-Revision: 520358 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2019 04:52:15 -0000 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?= +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