summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorRobert Schütz <rschuetz17@gmail.com>2018-05-27 19:37:46 +0200
committerGitHub <noreply@github.com>2018-05-27 19:37:46 +0200
commit873bb9a5b1b9608dc980eddfdf2554c1c27a072f (patch)
treedf19b43ccc600654d7ee99df8963aaf0dcdc5111 /pkgs/development/python-modules
parentfc1b5ecc9248cc133b590565ad1bf2fdbac60ed2 (diff)
parent1e815b50c98355a1b5d7b9b00b3319dd00b51131 (diff)
downloadnixlib-873bb9a5b1b9608dc980eddfdf2554c1c27a072f.tar
nixlib-873bb9a5b1b9608dc980eddfdf2554c1c27a072f.tar.gz
nixlib-873bb9a5b1b9608dc980eddfdf2554c1c27a072f.tar.bz2
nixlib-873bb9a5b1b9608dc980eddfdf2554c1c27a072f.tar.lz
nixlib-873bb9a5b1b9608dc980eddfdf2554c1c27a072f.tar.xz
nixlib-873bb9a5b1b9608dc980eddfdf2554c1c27a072f.tar.zst
nixlib-873bb9a5b1b9608dc980eddfdf2554c1c27a072f.zip
Merge pull request #41140 from bhipple/u/python-keyrings-alt
pythonPackages.keyrings-alt: 2.3 -> 3.1
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/keyrings-alt/default.nix18
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index 140d4297cda5..9f3fc8dc4d36 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -1,20 +1,26 @@
-{ stdenv, buildPythonPackage, fetchPypi, six
-, pytest, unittest2, mock, keyring
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, six
+, pytest, pytest-flake8, backports_unittest-mock, keyring, setuptools_scm
 }:
 
 buildPythonPackage rec {
   pname = "keyrings.alt";
-  version = "2.3";
+  version = "3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d";
+    sha256 = "0nnva8g03dv6gdhjk1ihn2qw7g15232fyj8shipah9whgfv8d75m";
   };
+
+  nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ six ];
 
   # Fails with "ImportError: cannot import name mock"
-  doCheck = false;
-  checkInputs = [ pytest unittest2 mock keyring ];
+  #doCheck = false;
+  checkInputs = [ pytest pytest-flake8 keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock;
+
+  checkPhase = ''
+    py.test
+  '';
 
   meta = with stdenv.lib; {
     license = licenses.mit;