From 7c995f12273bfe0627e85e472d7ad885624d60ac Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 20 Dec 2018 21:44:37 -0500 Subject: [PATCH] pythonPackages.github3_py: cleanup --- .../python-modules/github3_py/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 7b378660cffa..cab7ca68ef60 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -1,18 +1,19 @@ -{ stdenv +{ lib +, pythonOlder , buildPythonPackage , fetchPypi -, unittest2 -, pytest -, mock , betamax +, pytest , betamax-matchers -, dateutil +, unittest2 +, mock , requests -, pyopenssl , uritemplate +, dateutil +, jwcrypto +, pyopenssl , ndg-httpsclient , pyasn1 -, jwcrypto }: buildPythonPackage rec { @@ -24,18 +25,19 @@ buildPythonPackage rec { sha256 = "35fea5bf3567a8e88d3660686d83f96ef164e698ce6fb30f9e2b0edded7357af"; }; - buildInputs = [ unittest2 pytest mock betamax betamax-matchers dateutil ]; + checkInputs = [ betamax pytest betamax-matchers ] + ++ lib.optional (pythonOlder "3") unittest2 + ++ lib.optional (pythonOlder "3.3") mock; propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; postPatch = '' - sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py ''; # TODO: only disable the tests that require network doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://github3py.readthedocs.org/en/master/; description = "A wrapper for the GitHub API written in python"; license = licenses.bsd3;