diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 173bcc8ffcc0..95965db6e548 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -11,7 +11,7 @@ jupyter-client, jupyter-core, matplotlib-inline, - nest-asyncio, + nest-asyncio2, packaging, psutil, pyzmq, @@ -22,14 +22,15 @@ sage, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ipykernel"; - version = "7.1.0"; + version = "7.3.0"; pyproject = true; + __structuredAttrs = true; src = fetchPypi { - inherit pname version; - hash = "sha256-WKP8iFM9WTDDVG3H6sZsbSiKzeT4AeIAHmXtxdyc8Ns="; + inherit (finalAttrs) pname version; + hash = "sha256-msqq+X0WNVFm5Aha/p0iW/vfK371IPnfO+jyskgnXgk="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -43,7 +44,7 @@ buildPythonPackage rec { jupyter-client jupyter-core matplotlib-inline - nest-asyncio + nest-asyncio2 packaging psutil pyzmq @@ -63,8 +64,8 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; homepage = "https://ipython.org/"; - changelog = "https://github.com/ipython/ipykernel/releases/tag/v${version}"; + changelog = "https://github.com/ipython/ipykernel/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; teams = [ lib.teams.jupyter ]; }; -} +}) diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index 3e4191104769..2fbc34819529 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -6,9 +6,11 @@ ipykernel, ipyparallel, pre-commit, - pytestCheckHook, pytest-asyncio, + pytestCheckHook, + pytest-cov-stub, pytest-timeout, + trio, }: buildPythonPackage { @@ -24,27 +26,18 @@ buildPythonPackage { ipykernel ipyparallel pre-commit - pytestCheckHook pytest-asyncio + pytestCheckHook + pytest-cov-stub pytest-timeout + trio ]; preCheck = '' export HOME=$(mktemp -d) ''; - disabledTests = [ - # The following three tests fail for unclear reasons. - # pytest.PytestUnhandledThreadExceptionWarning: Exception in thread Thread-8 - "test_asyncio_interrupt" - - # DeprecationWarning: Passing unrecognized arguments to super(IPythonKernel) - "test_embed_kernel_func" - - # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... - "test_install_kernelspec" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # see https://github.com/NixOS/nixpkgs/issues/76197 "test_subprocess_print" "test_subprocess_error"