From 39adcea9d65681e51044dc7ac6aa3a0df7092a74 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sat, 3 Nov 2018 22:11:11 -0400 Subject: [PATCH] python36Packges.ipykernel: 4.8.2 -> 5.1.0 --- .../python-modules/ipykernel/4.nix | 41 +++++++++++++++++++ .../python-modules/ipykernel/default.nix | 30 ++++++-------- pkgs/top-level/python-packages.nix | 5 ++- 3 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/ipykernel/4.nix diff --git a/pkgs/development/python-modules/ipykernel/4.nix b/pkgs/development/python-modules/ipykernel/4.nix new file mode 100644 index 00000000000..49dfbf6ad8e --- /dev/null +++ b/pkgs/development/python-modules/ipykernel/4.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, isPy27 +, mock +, ipython +, jupyter_client +, pexpect +, traitlets +, tornado +}: + +buildPythonPackage rec { + pname = "ipykernel"; + version = "4.10.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad"; + }; + + checkInputs = [ nose ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ + ipython + jupyter_client + pexpect + traitlets + tornado + ]; + + # Tests require backends. + # I don't want to add all supported backends as propagatedBuildInputs + doCheck = false; + + meta = { + description = "IPython Kernel for Jupyter"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 9d4392583be..43b1c9fd034 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -1,37 +1,31 @@ { lib , buildPythonPackage , fetchPypi -, nose -, isPy27 -, mock , ipython , jupyter_client -, pexpect , traitlets , tornado +, pythonOlder +, pytest +, nose }: buildPythonPackage rec { pname = "ipykernel"; - version = "4.8.2"; + version = "5.1.0"; + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "c091449dd0fad7710ddd9c4a06e8b9e15277da306590bc07a3a1afa6b4453c8f"; + sha256 = "0fc0bf97920d454102168ec2008620066878848fcfca06c22b669696212e292f"; }; - buildInputs = [ nose ] ++ lib.optional isPy27 mock; - propagatedBuildInputs = [ - ipython - jupyter_client - pexpect - traitlets - tornado - ]; + checkInputs = [ pytest nose ]; + propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; - # Tests require backends. - # I don't want to add all supported backends as propagatedBuildInputs - doCheck = false; + checkPhase = '' + HOME=$(mktemp -d) pytest ipykernel + ''; meta = { description = "IPython Kernel for Jupyter"; @@ -39,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c63bd3a1520..8b5dce2605d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2539,7 +2539,10 @@ in { ipy = callPackage ../development/python-modules/IPy { }; - ipykernel = callPackage ../development/python-modules/ipykernel { }; + ipykernel = if pythonOlder "3.4" then + callPackage ../development/python-modules/ipykernel/4.nix { } + else + callPackage ../development/python-modules/ipykernel { }; ipyparallel = callPackage ../development/python-modules/ipyparallel { };