From patchwork Wed Oct 7 07:32:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 24496 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 877D527BBE8; Wed, 7 Oct 2020 08:33:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC6D127BBE9 for ; Wed, 7 Oct 2020 08:33:09 +0100 (BST) Received: from localhost ([::1]:44384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQ3wi-0003QK-P9 for patchwork@mira.cbaines.net; Wed, 07 Oct 2020 03:33:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQ3wd-0003Pw-46 for guix-patches@gnu.org; Wed, 07 Oct 2020 03:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kQ3wc-0002Tb-Mb for guix-patches@gnu.org; Wed, 07 Oct 2020 03:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kQ3wc-0004ff-KK for guix-patches@gnu.org; Wed, 07 Oct 2020 03:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43842] [PATCH] gnu: python-chardet: Enable tests Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Oct 2020 07:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43842@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.160205597317936 (code B ref -1); Wed, 07 Oct 2020 07:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Oct 2020 07:32:53 +0000 Received: from localhost ([127.0.0.1]:55010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQ3wR-0004fB-9t for submit@debbugs.gnu.org; Wed, 07 Oct 2020 03:32:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:33140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQ3wN-0004f0-13 for submit@debbugs.gnu.org; Wed, 07 Oct 2020 03:32:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQ3wL-0003ON-7U for guix-patches@gnu.org; Wed, 07 Oct 2020 03:32:45 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:38943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kQ3wE-0002SG-SV for guix-patches@gnu.org; Wed, 07 Oct 2020 03:32:44 -0400 Received: by mail-wr1-x42d.google.com with SMTP id k10so931112wru.6 for ; Wed, 07 Oct 2020 00:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leibniz-psychology-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=nMrOI4FyXN856Dj4I8KpNBFpP5+8EMX2zhOxJzov1xk=; b=PQF2IICch2juM9IoAo4exK53Bzz+X6qWi3MVPpoZLDKfHZcowU5F3XW2jUPFvvpEkS 0x2qJcgRLIuNxM5IiuOaf3RUaQChVizCMAP/h771yRkiVYMIw2jGJsjiKzrgdJCCmzIX TNE29JlGy+rOkLWQ5RkVzAcLzUErSYGpQbz1byvGz/dzk5vZqnKLQRoxVpWxJZbyvBrl j4ofhKflbfU3XSQ7B1iVHkmwpdKG5n9zVvLiRI36L3dUwY/+T9V5XSrphGjKg4RSNxJn WGkyfYT9O7JxOnJ6WFecCmwk92ys+l/TuKmZhcY0lrnlGDkekF0CML+zCDXVdnvrLqjN UKNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=nMrOI4FyXN856Dj4I8KpNBFpP5+8EMX2zhOxJzov1xk=; b=hGjw+a6oRb/TNc/lD5bs+4365tgHBr6c8+XT7oc8yl4EJLvBuld7zn2G9JffbSafZp z3Y3kgZ1dVm9q0EJ3EqnCBkHLPwJ7m0MLfaK14USLI3ZJmD3Dc20wlOxDXmYl6SAV0k3 unvs/H7TkOSyTBVoJdZYk98D05uQmqFwzuYHZkFQ9amJEaFM7jC9cgqgZhTFE29y8ddz 5WbPO+boLNuDTkSa8gkd65z0TPlJ6RLOLJUL2NyOJ85l01MI1C/Gm1BpUUlcrVW1HfZB BSqInlr57BEmMo55tK8SDwUoobNZ2pRNdMSaZa7K3uwwyf1zDZtKQKEekxFWSOV7Jfq7 8uJw== X-Gm-Message-State: AOAM531lwhKNMvPXRJz69dC8qdhFEYh/42ONKD1KupLNUayxBODAXeJD fLMJaeb6zPjKmTkDmB+vPxUdtL1XnYmZEIYMhJD0qgXtM+rmh38IyC2+tEfp04VxiD7w4DRzdOH V+RQz9jk3JQmLYw5LUFi1sEVi8uBHXbB71oRpGzKKqadh68Lv29QuYxFikfbl0mZl+Mm8ljG/MM w/UlnI+1L9Rw== X-Google-Smtp-Source: ABdhPJz7d30QQz8DHjbwxd5mK/guPRtpdA706lp1Ey4bAZAbVay0OVXkODB7DG7eN2xDiIlFXtA/tA== X-Received: by 2002:adf:f50c:: with SMTP id q12mr2055898wro.249.1602055955965; Wed, 07 Oct 2020 00:32:35 -0700 (PDT) Received: from localhost (dynamic-2a01-0c23-7832-6c00-7ddb-5ac3-d385-f92a.c23.pool.telefonica.de. [2a01:c23:7832:6c00:7ddb:5ac3:d385:f92a]) by smtp.gmail.com with ESMTPSA id w7sm1376080wmc.43.2020.10.07.00.32.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Oct 2020 00:32:34 -0700 (PDT) Date: Wed, 7 Oct 2020 09:32:34 +0200 From: Lars-Dominik Braun Message-ID: <20201007073234.GA6057@zpidnp36> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Received-SPF: none client-ip=2a00:1450:4864:20::42d; envelope-from=ldb@leibniz-psychology.org; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-chardet) [source]: Add upstream patch. [arguments]: Remove. * gnu/packages/patches/python-chardet-3.0.4-pytest.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../patches/python-chardet-3.0.4-pytest.patch | 24 +++++++++++++++++++ gnu/packages/python-xyz.scm | 5 ++-- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/python-chardet-3.0.4-pytest.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83d2d72ab1..e1fd179ebf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1490,6 +1490,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ + %D%/packages/patches/python-chardet-3.0.4-pytest.patch \ %D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ diff --git a/gnu/packages/patches/python-chardet-3.0.4-pytest.patch b/gnu/packages/patches/python-chardet-3.0.4-pytest.patch new file mode 100644 index 0000000000..039816b780 --- /dev/null +++ b/gnu/packages/patches/python-chardet-3.0.4-pytest.patch @@ -0,0 +1,24 @@ +From 440828f8faafdb58700c64a9ea8f6a30b154c08b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 11 Nov 2019 21:02:51 +0100 +Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters + (#174) + +Fixes https://github.com/chardet/chardet/issues/173 +--- + test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test.py b/test.py +index 9833307..ad2b753 100644 +--- a/test.py ++++ b/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 + + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 459526941b..b03d685d38 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10049,14 +10049,13 @@ simulation, statistical modeling, machine learning and much more.") (uri (pypi-uri "chardet" version)) (sha256 (base32 - "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4")))) + "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4")) + (patches (search-patches "python-chardet-3.0.4-pytest.patch")))) (native-inputs `(("python-hypothesis" ,python-hypothesis) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (build-system python-build-system) - ;; XXX: Incompatible with Pytest 4: . - (arguments `(#:tests? #f)) (home-page "https://github.com/chardet/chardet") (synopsis "Universal encoding detector for Python 2 and 3") (description