From 29ad89a851f2c5c811fe5282d0d3f2ba85ad3d8d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 17 Dec 2022 11:59:22 +0100 Subject: [PATCH] python3.pkgs.uvicorn: 0.18.2 -> 0.20.0 Most notably this isn't using setuptools anymore, but pyproject as format. ChangeLogs: * https://github.com/encode/uvicorn/releases/tag/0.18.3 * https://github.com/encode/uvicorn/releases/tag/0.19.0 * https://github.com/encode/uvicorn/releases/tag/0.20.0 --- pkgs/development/python-modules/uvicorn/default.nix | 11 ++++++++--- pkgs/development/python-modules/uvicorn/tests.nix | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 26d23f08afa4..e48536e66359 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -11,19 +11,22 @@ , uvloop , watchfiles , websockets +, hatchling , pythonOlder }: buildPythonPackage rec { pname = "uvicorn"; - version = "0.18.2"; - disabled = pythonOlder "3.6"; + version = "0.20.0"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - hash = "sha256-nxtDqYh2OmDtoV10CEBGYQrQBf+Xtuf5k9yR6UfCgYc="; + hash = "sha256-yca6JI3/aqdZF7SxFeYr84GOeQnLBmbm1dIXjngX9Ng="; }; outputs = [ @@ -31,6 +34,8 @@ buildPythonPackage rec { "testsout" ]; + nativeBuildInputs = [ hatchling ]; + propagatedBuildInputs = [ click h11 diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index b9cd883f43c0..116a9f1d28d0 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -16,6 +16,8 @@ buildPythonPackage rec { pname = "uvicorn-tests"; inherit (uvicorn) version; + format = "other"; + src = uvicorn.testsout; dontBuild = true; @@ -44,6 +46,8 @@ buildPythonPackage rec { disabledTests = [ "test_supported_upgrade_request" "test_invalid_upgrade" + "test_no_server_headers" + "test_multiple_server_header" ]; }