Merge pull request #220703 from dotlambda/fastapi-databases

python310Packages.fastapi: don't run databases tests

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

@@ -39,6 +39,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
+      --replace '"databases[sqlite] >=0.3.2,<0.7.0",' "" \
       --replace "starlette==" "starlette>="
   '';
 
@@ -49,7 +50,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     aiosqlite
-    databases
+    # databases FIXME incompatible with SQLAlchemy 2.0
     flask
     httpx
     orjson
@@ -73,6 +74,9 @@ buildPythonPackage rec {
     "tests/test_default_response_class.py"
     # Don't test docs and examples
     "docs_src"
+    # databases is incompatible with SQLAlchemy 2.0
+    "tests/test_tutorial/test_async_sql_databases"
+    "tests/test_tutorial/test_sql_databases"
   ];
 
   disabledTests = [

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

@@ -7,6 +7,7 @@
 , pythonOlder
 
 # pythonPackages
+, hatchling
 , dnspython
 , expiringdict
 , publicsuffix2
@@ -40,20 +41,26 @@ let
 in
 buildPythonPackage rec {
   pname = "parsedmarc";
-  version = "8.2.0";
+  version = "8.4.2";
 
   disabled = pythonOlder "3.7";
 
+  format = "pyproject";
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eb82328dffb4a62ddaefbcc22efd5a2694350504a56d41ba1e161f2d998dcbff";
+    hash = "sha256-6dP9zQI0jYiE+lUhmFBNp8Sv9povm9Pa4R4TuzAmEQk=";
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
+    substituteInPlace pyproject.toml \
       --replace "elasticsearch<7.14.0" "elasticsearch"
   '';
 
+  nativeBuildInputs = [
+    hatchling
+  ];
+
   propagatedBuildInputs = [
     dnspython
     expiringdict
@@ -91,6 +98,7 @@ buildPythonPackage rec {
   };
 
   meta = {
+    changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}";
     description = "Python module and CLI utility for parsing DMARC reports";
     homepage = "https://domainaware.github.io/parsedmarc/";
     maintainers = with lib.maintainers; [ talyz ];

pkgs/tools/misc/ntfy/default.nix

@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, python
+, python39
 , fetchFromGitHub
 , fetchpatch
 , withXmpp ? !stdenv.isDarwin
@@ -12,7 +12,21 @@
 }:
 
 let
-  ntfy-webpush = python.pkgs.callPackage ./webpush.nix { };
+  python = python39.override {
+    packageOverrides = self: super: {
+      ntfy-webpush = self.callPackage ./webpush.nix { };
+
+      # databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0
+      sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
+        version = "1.4.46";
+        src = self.fetchPypi {
+          pname = "SQLAlchemy";
+          inherit version;
+          hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
+        };
+      });
+    };
+  };
 in python.pkgs.buildPythonApplication rec {
   pname = "ntfy";
   version = "2.7.0";

pkgs/top-level/all-packages.nix

@@ -10399,7 +10399,7 @@ with pkgs;
   # ntfsprogs are merged into ntfs-3g
   ntfsprogs = pkgs.ntfs3g;
 
-  ntfy = callPackage ../tools/misc/ntfy { python = python39; };
+  ntfy = callPackage ../tools/misc/ntfy { };
 
   ntfy-sh = callPackage ../tools/misc/ntfy-sh { };