From 1b130c8ababc2db6e8f4ae18b37c9b1601f13e6c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 25 May 2023 23:12:42 +0200 Subject: [PATCH 1/2] python310Packages.trio-websocket: 0.9.2 -> 0.10.2 Fixes the build on Python 3.11. https://github.com/HyperionGray/trio-websocket/blob/0.10.2/CHANGELOG.md https://github.com/HyperionGray/trio-websocket/compare/0.9.2...0.10.2 --- .../python-modules/trio-websocket/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index c499812dd0b7..362cefdde16e 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, async_generator +, exceptiongroup , pytest-trio , pytestCheckHook , trio @@ -11,17 +11,18 @@ buildPythonPackage rec { pname = "trio-websocket"; - version = "0.9.2"; + version = "0.10.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "HyperionGray"; repo = "trio-websocket"; rev = version; - hash = "sha256-8VrpI/pk5IhEvqzo036cnIbJ1Hu3UfQ6GHTNkNJUYvo="; + hash = "sha256-djoTxkIKY52l+WnxL1FwlqrU/zvsLVkPUAHn9BxJ45k="; }; propagatedBuildInputs = [ - async_generator + exceptiongroup trio wsproto ]; @@ -35,7 +36,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "trio_websocket" ]; meta = with lib; { + changelog = "https://github.com/HyperionGray/trio-websocket/blob/${version}/CHANGELOG.md"; description = "WebSocket client and server implementation for Python Trio"; + homepage = "https://github.com/HyperionGray/trio-websocket"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 658c04960286b5afcb268a2f402d6ab0ce737d07 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 28 May 2023 19:57:45 +0200 Subject: [PATCH 2/2] python310Packages.trio-websocket: fix/disable tests on darwin --- .../python-modules/trio-websocket/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 362cefdde16e..45f4b195a80b 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , exceptiongroup @@ -33,6 +34,19 @@ buildPythonPackage rec { trustme ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Failed: DID NOT RAISE + "test_finalization_dropped_exception" + # Timing related + "test_client_close_timeout" + "test_cm_exit_with_pending_messages" + "test_server_close_timeout" + "test_server_handler_exit" + "test_server_open_timeout" + ]; + + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "trio_websocket" ]; meta = with lib; {