From 950bb6ec53ee1d70507879e51c25efe94a8c453d Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Thu, 8 Dec 2022 14:24:56 +0200
Subject: [PATCH 1/3] python3Packages.dependency-injector: 4.35.3 -> 4.40.0

https://github.com/ets-labs/python-dependency-injector/releases/tag/4.40.0
---
 .../python-modules/dependency-injector/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 628e18931255..936e8d97b3c6 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "dependency-injector";
-  version = "4.35.3";
+  version = "4.40.0";
 
   src = fetchFromGitHub {
     owner = "ets-labs";
     repo = "python-dependency-injector";
     rev = version;
-    sha256 = "sha256-2qe4A2T3EagNCh1zSbPWblVN7p9NH8rNwQQVyESJTdk=";
+    sha256 = "sha256-lcgPFdAgLmv7ILL2VVfqtGSw96aUfPv9oiOhksRtF3k=";
   };
 
   propagatedBuildInputs = [
@@ -42,16 +42,6 @@ buildPythonPackage rec {
     pyyaml
   ];
 
-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "six>=1.7.0,<=1.15.0" "six"
-  '';
-
-  disabledTestPaths = [
-    # There is no unique identifier to disable the one failing test
-    "tests/unit/ext/test_aiohttp_py35.py"
-  ];
-
   pythonImportsCheck = [ "dependency_injector" ];
 
   meta = with lib; {

From 64421f1a3b0d3922be4c29fd8df84f580b809721 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Dec 2022 09:06:55 +0100
Subject: [PATCH 2/3] python3Packages.dependency-injector: add changelog to
 meta

- disable on unsupported Python releases
---
 .../python-modules/dependency-injector/default.nix    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 936e8d97b3c6..525ae48d8587 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -12,17 +12,21 @@
 , pytestCheckHook
 , pyyaml
 , six
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "dependency-injector";
   version = "4.40.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ets-labs";
     repo = "python-dependency-injector";
     rev = version;
-    sha256 = "sha256-lcgPFdAgLmv7ILL2VVfqtGSw96aUfPv9oiOhksRtF3k=";
+    hash = "sha256-lcgPFdAgLmv7ILL2VVfqtGSw96aUfPv9oiOhksRtF3k=";
   };
 
   propagatedBuildInputs = [
@@ -42,11 +46,14 @@ buildPythonPackage rec {
     pyyaml
   ];
 
-  pythonImportsCheck = [ "dependency_injector" ];
+  pythonImportsCheck = [
+    "dependency_injector"
+  ];
 
   meta = with lib; {
     description = "Dependency injection microframework for Python";
     homepage = "https://github.com/ets-labs/python-dependency-injector";
+    changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${version}/docs/main/changelog.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [ gerschtli ];
   };

From 413c0f01226a735436c9cb80cb8ca13838f46064 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Dec 2022 09:24:55 +0100
Subject: [PATCH 3/3] python310Packages.dependency-injector: add
 optional-dependencies

---
 .../dependency-injector/default.nix           | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 525ae48d8587..98acaaba4094 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -7,12 +7,13 @@
 , httpx
 , mypy-boto3-s3
 , numpy
-, scipy
 , pydantic
+, pytest-asyncio
 , pytestCheckHook
-, pyyaml
-, six
 , pythonOlder
+, pyyaml
+, scipy
+, six
 }:
 
 buildPythonPackage rec {
@@ -33,23 +34,44 @@ buildPythonPackage rec {
     six
   ];
 
+  passthru.optional-dependencies = {
+    aiohttp = [
+      aiohttp
+    ];
+    pydantic = [
+      pydantic
+    ];
+    flask = [
+      flask
+    ];
+    yaml = [
+      pyyaml
+    ];
+  };
+
   checkInputs = [
-    aiohttp
     fastapi
-    flask
     httpx
     mypy-boto3-s3
     numpy
-    pydantic
-    scipy
+    pytest-asyncio
     pytestCheckHook
-    pyyaml
-  ];
+    scipy
+  ] ++ passthru.optional-dependencies.aiohttp
+  ++ passthru.optional-dependencies.pydantic
+  ++ passthru.optional-dependencies.yaml
+  ++ passthru.optional-dependencies.flask;
 
   pythonImportsCheck = [
     "dependency_injector"
   ];
 
+  disabledTestPaths = [
+    # Exclude tests for EOL Python releases
+    "tests/unit/ext/test_aiohttp_py35.py"
+    "tests/unit/wiring/test_*_py36.py"
+  ];
+
   meta = with lib; {
     description = "Dependency injection microframework for Python";
     homepage = "https://github.com/ets-labs/python-dependency-injector";