python312Packages.twisted: 24.3.0 -> 24.7.0

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

@@ -34,6 +34,11 @@ buildPythonPackage rec {
     hash = "sha256-1v58I9WOyyrp9n+qdvVeMZ3EObqP/06XCOZYS0nEvPU=";
   };
 
+  postPatch = ''
+    substituteInPlace requirements_setup.txt \
+      --replace-fail "==" ">="
+  '';
+
   build-system = [
     incremental
     setuptools

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

@@ -6,6 +6,7 @@
   fetchFromGitHub,
   incremental,
   pythonOlder,
+  pytest-asyncio,
   pytestCheckHook,
   setuptools,
 }:
@@ -24,7 +25,15 @@ buildPythonPackage rec {
     hash = "sha256-pN/F4Rdov06sm1yfJQEzmWyujWVeVU+bNGGkgnN4jYw=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    substituteInPlace requirements_setup.txt \
+      --replace-fail "==" ">="
+  '';
+
+  build-system = [
+    incremental
+    setuptools
+  ];
 
   dependencies = [
     aiohttp
@@ -33,14 +42,10 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     aioresponses
+    pytest-asyncio
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # AssertionError, https://github.com/timmo001/aiolyric/issues/61
-    "test_priority"
-  ];
-
   pythonImportsCheck = [ "aiolyric" ];
 
   meta = with lib; {

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

@@ -6,6 +6,7 @@
   buildPythonPackage,
   django,
   fetchFromGitHub,
+  fetchpatch2,
   hypothesis,
   pytest-asyncio,
   pytestCheckHook,
@@ -28,6 +29,15 @@ buildPythonPackage rec {
     hash = "sha256-RAK2CaKKVmVIv1MBK+9xyADOrHq664MQOry4KaGTNCw=";
   };
 
+  patches = [
+    # https://github.com/django/daphne/pull/526
+    (fetchpatch2 {
+      name = "fix-tests-with-Twisted-24.7.0.patch";
+      url = "https://github.com/django/daphne/commit/0370c7a0937011d5345b14d484ec171d3ae9f875.patch";
+      hash = "sha256-/3d2pRcEtGvINGHRQF3RZ8IVIETSZb6rhf+ZHUFSQQo=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace setup.cfg \
       --replace-fail "pytest-runner" ""

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

@@ -1,23 +1,36 @@
 {
-  lib,
   buildPythonPackage,
-  fetchPypi,
   click,
+  fetchFromGitHub,
+  lib,
+  pythonOlder,
+  setuptools,
+  tomli,
   twisted,
 }:
 
 let
   incremental = buildPythonPackage rec {
     pname = "incremental";
-    version = "22.10.0";
-    format = "setuptools";
-
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-kS/uteD34BiOb0IkHS9FAALhG7wJN8ZYZQRYVMJMC9A=";
+    version = "24.7.2";
+    pyproject = true;
+
+    src = fetchFromGitHub {
+      owner = "twisted";
+      repo = "incremental";
+      rev = "refs/tags/incremental-${version}";
+      hash = "sha256-5MlIKUaBUwLTet23Rjd2Opf5e54LcHuZDowcGon0lOE=";
     };
 
-    propagatedBuildInputs = [ click ];
+    # From upstream's pyproject.toml:
+    # "Keep this aligned with the project dependencies."
+    build-system = dependencies;
+
+    dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+
+    optional-dependencies = {
+      scripts = [ click ];
+    };
 
     # escape infinite recursion with twisted
     doCheck = false;
@@ -36,11 +49,12 @@ let
 
     pythonImportsCheck = [ "incremental" ];
 
-    meta = with lib; {
+    meta = {
+      changelog = "https://github.com/twisted/incremental/blob/${src.rev}/NEWS.rst";
       homepage = "https://github.com/twisted/incremental";
-      description = "Incremental is a small library that versions your Python projects";
-      license = licenses.mit;
-      maintainers = [ ];
+      description = "Small library that versions your Python projects";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ dotlambda ];
     };
   };
 in

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

@@ -24,7 +24,15 @@ buildPythonPackage rec {
     hash = "sha256-ZcTSf7UejEUqQo0qEXP3fWjZYRx0a3ZBNVkwS2dL3Yk=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    substituteInPlace requirements_setup.txt \
+      --replace-fail "==" ">="
+  '';
+
+  build-system = [
+    incremental
+    setuptools
+  ];
 
   nativeBuildInputs = [ incremental ];