branch master updated: Revert "gnu: python-chardet: Enable tests."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mbakke pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 58af4c9  Revert "gnu: python-chardet: Enable tests."
58af4c9 is described below

commit 58af4c9621af02cc4e2bb5692d4b377084b0fcc6
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Oct 14 00:46:30 2020 +0200

    Revert "gnu: python-chardet: Enable tests."
    
    This causes too many rebuilds for the master branch.
    
    This reverts commit 331aaf52806b27430c4efaf8f230097ede69e61a.
---
 gnu/local.mk                                           |  1 -
 gnu/packages/patches/python-chardet-3.0.4-pytest.patch | 15 ---------------
 gnu/packages/python-xyz.scm                            |  5 +++--
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index f3aeab3..d09875c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1491,7 +1491,6 @@ 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
deleted file mode 100644
index d5bf7cc..0000000
--- a/gnu/packages/patches/python-chardet-3.0.4-pytest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix test failure with Pytest 4.
-
-Taken from upstream:
-https://github.com/chardet/chardet/commit/440828f8faafdb58700c64a9ea8f6a30b154c08b
-
-diff --git a/test.py b/test.py
---- a/test.py
-+++ b/test.py
-@@ -59,5 +59,5 @@ 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 10fa9b5..47ad101 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10060,13 +10060,14 @@ simulation, statistical modeling, machine learning 
and much more.")
        (uri (pypi-uri "chardet" version))
        (sha256
         (base32
-         "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"))
-        (patches (search-patches "python-chardet-3.0.4-pytest.patch"))))
+         "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"))))
     (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: 
<https://github.com/chardet/chardet/issues/173>.
+    (arguments `(#:tests? #f))
     (home-page "https://github.com/chardet/chardet";)
     (synopsis "Universal encoding detector for Python 2 and 3")
     (description