1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00

Revert r569127, half of the ports tree is skipped after this upgrade

With hat:	portmgr
Reported by:	pkg-fallout
This commit is contained in:
Antoine Brodin 2021-03-25 08:11:07 +00:00
parent 562d171b9d
commit a5a7de1a87
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=569185
3 changed files with 23 additions and 5 deletions

View File

@ -2,13 +2,15 @@
# $FreeBSD$
PORTNAME= chardet
PORTVERSION= 4.0.0
PORTVERSION= 3.0.4
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= rm@FreeBSD.org
COMMENT= Universal Character Encoding Detector
COMMENT= Universal encoding detector for Python 2 and 3
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1616596503
SHA256 (chardet-4.0.0.tar.gz) = 0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa
SIZE (chardet-4.0.0.tar.gz) = 1907771
TIMESTAMP = 1499956132
SHA256 (chardet-3.0.4.tar.gz) = 84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae
SIZE (chardet-3.0.4.tar.gz) = 1868453

View File

@ -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