about summary refs log tree commit diff
path: root/pkgs/development/python-modules/natsort
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-02-18 20:07:30 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-02-18 20:07:43 +0100
commit7e2a46ecdfb674411111f672d3da248e181fe569 (patch)
treee9e28cc2cbc379b71d813a14f66d55bb23cb4b22 /pkgs/development/python-modules/natsort
parentf67e1c467dc51ee75e9807cba43404086242981d (diff)
python.pkgs.natsort: fix build
Diffstat (limited to 'pkgs/development/python-modules/natsort')
-rw-r--r--pkgs/development/python-modules/natsort/default.nix3
-rw-r--r--pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch37
2 files changed, 0 insertions, 40 deletions
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 206caa6f6ba05..a5940ed6c9f60 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -16,7 +16,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "natsort";
   version = "5.2.0";
 
@@ -39,8 +38,6 @@ buildPythonPackage rec {
     sha256 = "c960082d2145b04723041c4b85092546560538e29664dd197a1344d5b090bc91";
   };
 
-  patches = lib.optional (isPy35 || isPy36) ./python-3.6.3-test-failures.patch;
-
   # testing based on project's tox.ini
   checkPhase = ''
     pytest --doctest-modules natsort
diff --git a/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch b/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch
deleted file mode 100644
index b304a1d11e524..0000000000000
--- a/pkgs/development/python-modules/natsort/python-3.6.3-test-failures.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/test_natsort/test_string_component_transform_factory.py b/test_natsort/test_string_component_transform_factory.py
-index 6790e51..8db4efb 100644
---- a/test_natsort/test_string_component_transform_factory.py
-+++ b/test_natsort/test_string_component_transform_factory.py
-@@ -24,6 +24,8 @@ from hypothesis.strategies import (
- )
- from compat.locale import bad_uni_chars
- 
-+import pytest
-+
- 
- # Each test has an "example" version for demonstrative purposes,
- # and a test that uses the hypothesis module.
-@@ -77,6 +79,7 @@ def test_string_component_transform_factory_with_LOCALE_returns_fast_int_and_gro
-     assert _string_component_transform_factory(ns.LOCALE)(x) == fast_int(x, key=get_strxfrm())
- 
- 
-+@pytest.mark.xfail
- @given(text())
- def test_string_component_transform_factory_with_LOCALE_returns_fast_int_and_groupletters(x):
-     assume(x)
-@@ -89,6 +92,7 @@ def test_string_component_transform_factory_with_LOCALE_and_GROUPLETTERS_returns
-     assert _string_component_transform_factory(ns.GROUPLETTERS | ns.LOCALE)(x) == fast_int(x, key=lambda x: get_strxfrm()(_groupletters(x)))
- 
- 
-+@pytest.mark.xfail
- @given(text())
- def test_string_component_transform_factory_with_LOCALE_and_GROUPLETTERS_returns_fast_int_and_groupletters_and_locale_convert(x):
-     assume(x)
-@@ -104,6 +108,7 @@ def test_string_component_transform_factory_with_LOCALE_and_DUMB_returns_fast_in
-     assert _string_component_transform_factory(ns._DUMB | ns.LOCALE)(x) == fast_int(x, key=lambda x: get_strxfrm()(_groupletters(x)))
- 
- 
-+@pytest.mark.xfail
- @given(text())
- def test_string_component_transform_factory_with_LOCALE_and_DUMB_returns_fast_int_and_groupletters_and_locale_convert(x):
-     assume(x)