Merge pull request #169292 from fabaff/webthing-fix

python3Packages.pyee: add missing dependency

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

@@ -7,6 +7,7 @@
 , pytest-asyncio
 , aiosqlite
 , databases
+, fetchpatch
 , flask
 , httpx
 , passlib
@@ -19,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.75.1";
+  version = "0.75.2";
   format = "flit";
 
   disabled = pythonOlder "3.6";
@@ -28,7 +29,7 @@ buildPythonPackage rec {
     owner = "tiangolo";
     repo = pname;
     rev = version;
-    sha256 = "sha256-tSZ5isMzDhDsuVNQdoYXG0IYkgCvdVdARtFXELNjTtk=";
+    hash = "sha256-B4q3Q256Sj4jTQt1TDm3fiEaQKdVxddCF9+KsxkkTWo=";
   };
 
   propagatedBuildInputs = [
@@ -50,6 +51,16 @@ buildPythonPackage rec {
     trio
   ];
 
+  patches = [
+    # Bump starlette, https://github.com/tiangolo/fastapi/pull/4483
+    (fetchpatch {
+      name = "support-later-starlette.patch";
+      # PR contains multiple commits
+      url = "https://patch-diff.githubusercontent.com/raw/tiangolo/fastapi/pull/4483.patch";
+      sha256 = "sha256-ZWaqAd/QYEYRL1hSQdXdFPgWgdmOill2GtmEn33vz2U=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace "starlette ==" "starlette >="
@@ -70,10 +81,13 @@ buildPythonPackage rec {
 
   disabledTests = [
     "test_get_custom_response"
-
     # Failed: DID NOT RAISE <class 'starlette.websockets.WebSocketDisconnect'>
     "test_websocket_invalid_data"
     "test_websocket_no_credentials"
+    # TypeError: __init__() missing 1...starlette-releated
+    "test_head"
+    "test_options"
+    "test_trace"
   ];
 
   pythonImportsCheck = [

pkgs/development/python-modules/mypy-boto3-s3/default.nix

@@ -8,19 +8,18 @@
 
 buildPythonPackage rec {
   pname = "mypy-boto3-s3";
-  version = "1.21.27.post1";
+  version = "1.21.34";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LPc7ejocoSEtVaSW2Iye9EQiMrY4YU91bYSa4F3NRlg=";
+    hash = "sha256-gXvMC+GZknL+jYG9ZQD1/dqRhMwXrZvXG8CvCFYxdco=";
   };
 
   propagatedBuildInputs = [
     boto3
-  ] ++ lib.optionals (pythonOlder "3.9") [
     typing-extensions
   ];
 

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

@@ -70,8 +70,8 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'SQLAlchemy = ">=1.3.18,<=1.4.29"' 'SQLAlchemy = ">=1.3.18"' \
-      --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.5.5"' 'databases = ">=0.5.5"'
+      --replace 'SQLAlchemy = ">=1.3.18,<=1.4.31"' 'SQLAlchemy = ">=1.3.18"' \
+      --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<=0.5.5"' 'databases = ">=0.5.5"'
   '';
 
   disabledTests = [
@@ -84,8 +84,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = "https://github.com/collerek/ormar";
     description = "Async ORM with fastapi in mind and pydantic validation";
+    homepage = "https://github.com/collerek/ormar";
     license = licenses.mit;
     maintainers = with maintainers; [ andreasfelix ];
   };

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

@@ -1,30 +1,36 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, vcversioner
 , mock
-, pytestCheckHook
 , pytest-asyncio
 , pytest-trio
-, twisted
+, pytestCheckHook
 , pythonOlder
+, twisted
+, typing-extensions
+, vcversioner
 }:
 
 buildPythonPackage rec {
   pname = "pyee";
   version = "9.0.4";
+  format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI=";
+    hash = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI=";
   };
 
   buildInputs = [
     vcversioner
   ];
 
+  propagatedBuildInputs = [
+    typing-extensions
+  ];
+
   checkInputs = [
     mock
     pytest-asyncio
@@ -33,7 +39,9 @@ buildPythonPackage rec {
     twisted
   ];
 
-  pythonImportsCheck = [ "pyee" ];
+  pythonImportsCheck = [
+    "pyee"
+  ];
 
   meta = with lib; {
     description = "A port of Node.js's EventEmitter to Python";

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

@@ -1,6 +1,7 @@
 { lib
 , appdirs
 , buildPythonPackage
+, certifi
 , fetchFromGitHub
 , importlib-metadata
 , poetry-core
@@ -16,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pyppeteer";
-  version = "0.2.6";
+  version = "1.0.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -25,7 +26,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "sha256-mMFQp8GMjKUc3yyB4c8Tgxut7LkMFa2cySO3iSA/aI4=";
+    sha256 = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4=";
   };
 
   nativeBuildInputs = [
@@ -34,6 +35,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     appdirs
+    certifi
     importlib-metadata
     pyee
     tqdm
@@ -49,6 +51,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
+      --replace 'pyee = "^8.1.0"' 'pyee = "*"' \
       --replace 'websockets = "^9.1"' 'websockets = "*"'
   '';
 

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

@@ -4,6 +4,7 @@
 , ifaddr
 , jsonschema
 , pyee
+, pythonOlder
 , tornado
 , zeroconf
 }:
@@ -11,12 +12,15 @@
 buildPythonPackage rec {
   pname = "webthing";
   version = "0.15.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "WebThingsIO";
     repo = "webthing-python";
     rev = "v${version}";
-    sha256 = "06264rwchy4qmbn7lv7m00qg864y7aw3rngcqqcr9nvaqz4rb0fg";
+    hash = "sha256-z4GVycdq25QZxuzZPLg6nhj0MAD1bHrsqph4yHgmRhg=";
   };
 
   propagatedBuildInputs = [
@@ -27,9 +31,12 @@ buildPythonPackage rec {
     zeroconf
   ];
 
-  # no tests are present
+  # No tests are present
   doCheck = false;
-  pythonImportsCheck = [ "webthing" ];
+
+  pythonImportsCheck = [
+    "webthing"
+  ];
 
   meta = with lib; {
     description = "Python implementation of a Web Thing server";