From 3937a5d97913a399d7ba4c0d60bf9b32b17965c0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 22 Mar 2024 20:33:30 +0100 Subject: [PATCH] python311Packages.gradio: 4.20.1 -> 4.22.0 --- .../python-modules/gradio/default.nix | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index bfcf10a2ea1c..69e57b821a69 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -16,6 +16,7 @@ , setuptools , aiofiles , altair +, diffusers , fastapi , ffmpy , gradio-client @@ -40,6 +41,10 @@ , typer , tomlkit +# oauth +, authlib +, itsdangerous + # check , pytestCheckHook , boto3 @@ -57,7 +62,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.20.1"; + version = "4.22.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -66,7 +71,7 @@ buildPythonPackage rec { # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-nvuIpOFib09FJGfkX0TDfb2LV/eDn3EybsFp5A3lzas="; + hash = "sha256-nhrT509xB3+R+HF6TF5AQGnfufT6iNmzjxZgcVL7fBo="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -98,6 +103,7 @@ buildPythonPackage rec { setuptools # needed for 'pkg_resources' aiofiles altair + diffusers fastapi ffmpy gradio-client @@ -123,6 +129,11 @@ buildPythonPackage rec { tomlkit ] ++ typer.passthru.optional-dependencies.all; + passthru.optional-dependencies.oauth = [ + authlib + itsdangerous + ]; + nativeCheckInputs = [ pytestCheckHook boto3 @@ -138,9 +149,11 @@ buildPythonPackage rec { transformers vega-datasets - # mock npm to make `shutil.which("npm")` pass + # mock calls to `shutil.which(...)` (writeShellScriptBin "npm" "false") - ] ++ pydantic.passthru.optional-dependencies.email; + ] + ++ passthru.optional-dependencies.oauth + ++ pydantic.passthru.optional-dependencies.email; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. @@ -173,6 +186,9 @@ buildPythonPackage rec { # fails without network "test_download_if_url_correct_parse" + + # tests if pip and other tools are installed + "test_get_executable_path" ]; disabledTestPaths = [ # 100% touches network @@ -196,19 +212,17 @@ buildPythonPackage rec { # Cyclic dependencies are fun! # This is gradio without gradio-client and gradio-pdf - passthru = { - sans-reverse-dependencies = (gradio.override (old: { + passthru.sans-reverse-dependencies = (gradio.override (old: { gradio-client = null; gradio-pdf = null; })).overridePythonAttrs (old: { - pname = old.pname + "-sans-client"; + pname = old.pname + "-sans-reverse-dependencies"; pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; pythonImportsCheck = null; dontCheckRuntimeDeps = true; }); - }; meta = with lib; { homepage = "https://www.gradio.app/";