summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2019-10-26 15:46:50 -0700
committerFrederik Rietdijk <fridh@fridh.nl>2019-10-27 16:26:57 +0100
commitd0f75408854cf7d9c30009733ace300d9d98e568 (patch)
treece2c62d230771a4fa59c7691e07368d12144ae79
parentd118e8d185699289588c715bced07063bc77b664 (diff)
downloadnixpkgs-d0f75408854cf7d9c30009733ace300d9d98e568.tar
nixpkgs-d0f75408854cf7d9c30009733ace300d9d98e568.tar.gz
nixpkgs-d0f75408854cf7d9c30009733ace300d9d98e568.tar.bz2
nixpkgs-d0f75408854cf7d9c30009733ace300d9d98e568.tar.lz
nixpkgs-d0f75408854cf7d9c30009733ace300d9d98e568.tar.xz
nixpkgs-d0f75408854cf7d9c30009733ace300d9d98e568.tar.zst
nixpkgs-d0f75408854cf7d9c30009733ace300d9d98e568.zip
pythonPackages.testfixtures: 6.3.10 -> 6.10.0
-rw-r--r--pkgs/development/python-modules/testfixtures/default.nix19
1 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index f9d35297306..a08241332dc 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -1,25 +1,18 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
-, mock, pytest, sybil, zope_component }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy27
+, mock, pytest, sybil, zope_component, twisted }:
 
 buildPythonPackage rec {
   pname = "testfixtures";
-  version = "6.3.0";
+  version = "6.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x16xkw483nb1ngv74s7lgaj514pb1ldklal7kb7iwqbxcgnrh2k";
+    sha256 = "1kiv60i0s67v34x28j6cshby7n7mbhd7a7val639yvvlh1f0q8wx";
   };
 
-  checkInputs = [ pytest mock sybil zope_component ];
-
-  patches = [
-    # Fix tests for Python 3.7. Remove with the next release
-    (fetchpatch {
-      url = https://github.com/Simplistix/testfixtures/commit/6e8807543b804946aba58e2c9e92f5bdc3656a57.patch;
-      sha256 = "1584jz2qz04arx8z8f6d1l1vab7gi38k3akzm223rmp7j4m7yrii";
-    })
-  ];
+  checkInputs = [ pytest mock sybil zope_component twisted ];
 
+  doCheck = !isPy27;
   checkPhase = ''
     # django is too much hasle to setup at the moment
     pytest -W ignore::DeprecationWarning --ignore=testfixtures/tests/test_django testfixtures/tests