From 6dd98067758f70abf8538a01ade84ae1fa138b3e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 17 Oct 2022 00:21:42 +0200
Subject: [PATCH] python310Packages.json-logging: 1.3.0 -> 1.5.0-rc0

---
 .../python-modules/json-logging/default.nix   | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix
index 1f4425a3e11..a596dbe902b 100644
--- a/pkgs/development/python-modules/json-logging/default.nix
+++ b/pkgs/development/python-modules/json-logging/default.nix
@@ -1,44 +1,56 @@
 { lib
 , buildPythonPackage
+, fastapi
 , fetchFromGitHub
-, fetchpatch
-, pytestCheckHook
-, wheel
 , flask
+, pytestCheckHook
+, pythonOlder
+, requests
 , sanic
-, fastapi
 , uvicorn
-, requests
+, wheel
 }:
 
 buildPythonPackage rec {
   pname = "json-logging";
-  version = "1.3.0";
+  version = "1.5.0-rc0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "bobbui";
     repo = "json-logging-python";
     rev = version;
-    hash = "sha256-0eIhOi30r3ApyVkiBdTQps5tNj7rI+q8TjNWxTnhtMQ=";
+    hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE=";
   };
-  patches = [
-    # Fix tests picking up test modules instead of real packages.
-    (fetchpatch {
-      url = "https://github.com/bobbui/json-logging-python/commit/6fdb64deb42fe48b0b12bda0442fd5ac5f03107f.patch";
-      sha256 = "sha256-BLfARsw2FdvY22NCaFfdFgL9wTmEZyVIi3CQpB5qU0Y=";
-    })
+
+  checkInputs = [
+    fastapi
+    flask
+    pytestCheckHook
+    # quart
+    requests
+    sanic
+    uvicorn
+    wheel
+  ];
+
+  pythonImportsCheck = [
+    "json_logging"
+  ];
+
+  disabledTests = [
+    "quart"
   ];
 
-  # - Quart is not packaged for Nixpkgs.
-  checkInputs = [ wheel flask /*quart*/ sanic fastapi uvicorn requests pytestCheckHook ];
-  disabledTests = [ "quart" ];
-  # Tests spawn servers and try to connect to them.
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {
     description = "Python library to emit logs in JSON format";
     longDescription = ''
-      Python logging library to emit JSON log that can be easily indexed and searchable by logging infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver.
+      Python logging library to emit JSON log that can be easily indexed and searchable by logging
+      infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver.
     '';
     homepage = "https://github.com/bobbui/json-logging-python";
     license = licenses.asl20;