Merge staging-next into staging

pkgs/development/python-modules/google_auth/default.nix

@@ -1,19 +1,7 @@
-{ stdenv, buildPythonPackage, fetchpatch, fetchPypi
-, cachetools
-, flask
-, freezegun
-, mock
-, oauth2client
-, pyasn1-modules
-, pytest
-, pytest-localserver
-, requests
-, responses
-, rsa
-, setuptools
-, six
-, urllib3
-}:
+{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder
+, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client
+, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa
+, setuptools, six, urllib3 }:
 
 buildPythonPackage rec {
   pname = "google-auth";
@@ -21,9 +9,11 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h6lpbz8inxj2kpdjwrk5v7lqh1w5kkyv76d8sk3gs77y62xnxji";
+    sha256 = "5176db85f1e7e837a646cd9cede72c3c404ccf2e3373d9ee14b2db88febad440";
   };
 
+  disabled = pythonOlder "3.5";
+
   propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
 
   checkInputs = [
@@ -31,17 +21,13 @@ buildPythonPackage rec {
     freezegun
     mock
     oauth2client
-    pytest
+    pytestCheckHook
     pytest-localserver
     requests
     responses
     urllib3
   ];
 
-  checkPhase = ''
-    py.test
-  '';
-
   meta = with stdenv.lib; {
     description = "Google Auth Python Library";
     longDescription = ''
@@ -49,7 +35,8 @@ buildPythonPackage rec {
       authentication mechanisms to access Google APIs.
     '';
     homepage = "https://github.com/googleapis/google-auth-library-python";
-    changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
+    changelog =
+      "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md";
     # Documentation: https://googleapis.dev/python/google-auth/latest/index.html
     license = licenses.asl20;
     maintainers = with maintainers; [ ];