diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-10-25 20:04:35 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-10-27 21:34:42 +0200 |
| commit | 7ce848309e6d64820af1e96045c5386992e90a4a (patch) | |
| tree | 071df35feca74aea6640fcc3cd4a0a5af613d995 /pkgs/development/python-modules/testtools | |
| parent | b601d87cd65009dceacff3b8efa39c6ae0451558 (diff) | |
| download | nixpkgs-7ce848309e6d64820af1e96045c5386992e90a4a.tar nixpkgs-7ce848309e6d64820af1e96045c5386992e90a4a.tar.gz nixpkgs-7ce848309e6d64820af1e96045c5386992e90a4a.tar.bz2 nixpkgs-7ce848309e6d64820af1e96045c5386992e90a4a.tar.lz nixpkgs-7ce848309e6d64820af1e96045c5386992e90a4a.tar.xz nixpkgs-7ce848309e6d64820af1e96045c5386992e90a4a.tar.zst nixpkgs-7ce848309e6d64820af1e96045c5386992e90a4a.zip | |
python.pkgs: updates
Diffstat (limited to 'pkgs/development/python-modules/testtools')
| -rw-r--r-- | pkgs/development/python-modules/testtools/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/python-modules/testtools/testtools_support_unittest2.patch | 22 |
2 files changed, 7 insertions, 26 deletions
diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index d1f3a5feeaa..7b432154b60 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -8,11 +8,15 @@ , unittest2 , traceback2 , isPy3k +, fixtures +, pyrsistent }: +# testtools 2.0.0 and up has a circular run-time dependency on futures + buildPythonPackage rec { pname = "testtools"; - version = "1.8.0"; + version = "1.9.0"; name = "${pname}-${version}"; # Python 2 only judging from SyntaxError @@ -20,12 +24,11 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca"; + sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644"; }; - propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 ]; + propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ]; buildInputs = [ traceback2 ]; - patches = [ ./testtools_support_unittest2.patch ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch b/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch deleted file mode 100644 index 545e5f01ec0..00000000000 --- a/pkgs/development/python-modules/testtools/testtools_support_unittest2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e600d12980ccb807ba1ca3fb6a4da1d0b89c02f6 Mon Sep 17 00:00:00 2001 -From: Robert Collins <robertc@robertcollins.net> -Date: Wed, 1 Jul 2015 15:46:28 +1200 -Subject: [PATCH] Fix tests with unittest2 1.1.0 and higher. - -Change-Id: I4613d47852fbf901819f197f6e388ccaa717b53e ---- - testtools/tests/test_run.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testtools/tests/test_run.py b/testtools/tests/test_run.py -index ead716b..433b6f8 100644 ---- a/testtools/tests/test_run.py -+++ b/testtools/tests/test_run.py -@@ -201,6 +201,7 @@ def test_run_list_failed_import(self): - run.main, ['prog', 'discover', '-l', broken.package.base, '*.py'], out) - self.assertEqual(2, exc.args[0]) - self.assertThat(out.getvalue(), DocTestMatches("""\ -+unittest2.loader._FailedTest.runexample - Failed to import test module: runexample - Traceback (most recent call last): - File ".../loader.py", line ..., in _find_test_path |