summary refs log tree commit diff
path: root/pkgs/development/python-modules/pytest-mock
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2019-10-26 14:12:51 -0700
committerFrederik Rietdijk <fridh@fridh.nl>2019-10-27 16:26:56 +0100
commitfe42eae9fca10a9ae8190ba657b575dfde1f493e (patch)
tree4cb16cce5d6df55b4df1538cb3e247f95a86f5df /pkgs/development/python-modules/pytest-mock
parent0ccf10b955910dd511208720f3bbf49a2ffe9fbb (diff)
downloadnixpkgs-fe42eae9fca10a9ae8190ba657b575dfde1f493e.tar
nixpkgs-fe42eae9fca10a9ae8190ba657b575dfde1f493e.tar.gz
nixpkgs-fe42eae9fca10a9ae8190ba657b575dfde1f493e.tar.bz2
nixpkgs-fe42eae9fca10a9ae8190ba657b575dfde1f493e.tar.lz
nixpkgs-fe42eae9fca10a9ae8190ba657b575dfde1f493e.tar.xz
nixpkgs-fe42eae9fca10a9ae8190ba657b575dfde1f493e.tar.zst
nixpkgs-fe42eae9fca10a9ae8190ba657b575dfde1f493e.zip
pythonPackages.pytest-mock: 1.10.4 -> 1.11.
Diffstat (limited to 'pkgs/development/python-modules/pytest-mock')
-rw-r--r--pkgs/development/python-modules/pytest-mock/default.nix16
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 58e032df4df..c6c8b6f4f5c 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-mock";
-  version = "1.10.4";
+  version = "1.11.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568";
+    sha256 = "04fgqm06vkg3k1ngha65g1k5a80x1g7pr11s78j2d72rj4w2ql7a";
   };
 
   propagatedBuildInputs = lib.optional (!isPy3k) mock;
@@ -27,18 +27,8 @@ buildPythonPackage rec {
     pytest
   ];
 
-  patches = [
-    # Fix tests for pytest 4.6. Remove with the next release
-    (fetchpatch {
-      url = "https://github.com/pytest-dev/pytest-mock/commit/189cc599d3bfbe91a17c93211c04237b6c5849b1.patch";
-      sha256 = "13nk75ldab3j8nfzyd9w4cgfk2fxq4if1aqkqy82ar7y7qh07a7m";
-    })
-  ];
-
   checkPhase = ''
-    # remove disabled test on next release
-    # https://github.com/pytest-dev/pytest-mock/pull/151
-    pytest -k "not test_detailed_introspection"
+    pytest
   '';
 
   meta = with lib; {