From d957d3ed9cfdb83ef6e6b7e4d4d9017d0dbfb44d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 28 Nov 2021 18:35:30 +0100 Subject: [PATCH] python3Packages.httplib2: 0.20.1 -> 0.20.3 --- .../python-modules/httplib2/default.nix | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index c39904981619..3f48af86e581 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, cryptography , fetchFromGitHub , isPy27 , mock @@ -15,27 +16,22 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.20.1"; + version = "0.20.3"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1zqs3YRVtm5DwewETLtRg5XhMJPJsMi0QLfeGirOURs="; + sha256 = "sha256-Q5KkhVqyHDoIeKjvvYoHRbZPY7LUXGDwgp4CSuyvQ1g="; }; - postPatch = '' - sed -i "/--cov/d" setup.cfg - ''; - - propagatedBuildInputs = [ pyparsing ]; - - pythonImportsCheck = [ "httplib2" ]; - - # Don't run tests for Python 2.7 - doCheck = !isPy27; + propagatedBuildInputs = [ + pyparsing + ]; checkInputs = [ + cryptography mock pytest-forked pytest-randomly @@ -45,16 +41,29 @@ buildPythonPackage rec { pytestCheckHook ]; + # Don't run tests for Python 2.7 + doCheck = !isPy27; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + disabledTests = lib.optionals (stdenv.isDarwin) [ # fails with HTTP 408 Request Timeout, instead of expected 200 OK "test_timeout_subsequent" ]; - pytestFlagsArray = [ "--ignore python2" ]; + pytestFlagsArray = [ + "--ignore python2" + ]; + + pythonImportsCheck = [ + "httplib2" + ]; meta = with lib; { description = "A comprehensive HTTP client library"; - homepage = "https://httplib2.readthedocs.io"; + homepage = "https://github.com/httplib2/httplib2"; license = licenses.mit; maintainers = with maintainers; [ fab ]; };