diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-chardet-3.0.4-pytest.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 5 |
3 files changed, 3 insertions, 18 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f3aeab36fd..d09875c583 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 d5bf7ccc28..0000000000 --- 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 10fa9b54b4..47ad101e4d 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 |