From cca0aeeb68e9af722729eb6661ff6d8e68304e03 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 21 May 2019 17:51:14 +0200 Subject: [PATCH 1/3] spyder: convert to python modules --- .../python-modules/spyder-kernels/default.nix | 27 ++++++++++++ .../python-modules}/spyder/default.nix | 41 ++++--------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 3 ++ 4 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/python-modules/spyder-kernels/default.nix rename pkgs/{applications/science => development/python-modules}/spyder/default.nix (60%) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix new file mode 100644 index 000000000000..27da324a29b3 --- /dev/null +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer }: + +buildPythonPackage rec { + pname = "spyder-kernels"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; + }; + + propagatedBuildInputs = [ + cloudpickle + ipykernel + wurlitzer + ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Jupyter kernels for Spyder's console"; + homepage = "https://github.com/spyder-ide/spyder-kernels"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix similarity index 60% rename from pkgs/applications/science/spyder/default.nix rename to pkgs/development/python-modules/spyder/default.nix index 417d5544d6c8..a368d7704c90 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,42 +1,18 @@ -{ stdenv, python3, makeDesktopItem }: +{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, + psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, + qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, + spyder-kernels }: -let - - spyder-kernels = with python3.pkgs; buildPythonPackage rec { - pname = "spyder-kernels"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; - }; - - propagatedBuildInputs = [ - cloudpickle - ipykernel - wurlitzer - ]; - - # No tests - doCheck = false; - - meta = { - description = "Jupyter kernels for Spyder's console"; - homepage = https://github.com/spyder-ide/spyder-kernels; - license = stdenv.lib.licenses.mit; - }; - }; - -in python3.pkgs.buildPythonApplication rec { +buildPythonPackage rec { pname = "spyder"; version = "3.3.3"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba"; }; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels ]; @@ -68,8 +44,9 @@ in python3.pkgs.buildPythonApplication rec { environment for the Python language with advanced editing, interactive testing, debugging and introspection features. ''; - homepage = https://github.com/spyder-ide/spyder/; + homepage = "https://github.com/spyder-ide/spyder/"; license = licenses.mit; platforms = platforms.linux; + maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 647e32175912..d1b0fded24ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22869,7 +22869,7 @@ in simgrid = callPackage ../applications/science/misc/simgrid { }; - spyder = callPackage ../applications/science/spyder { }; + spyder = with python3.pkgs; toPythonApplication spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fe2fc7eff36e..b106260dbd48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -932,6 +932,9 @@ in { sniffio = callPackage ../development/python-modules/sniffio { }; + spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; + spyder = callPackage ../development/python-modules/spyder {}; + tenacity = callPackage ../development/python-modules/tenacity { }; tokenserver = callPackage ../development/python-modules/tokenserver {}; From 7f68caa38f3db0ddff499ca7b0bad431a089fe5a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 21 May 2019 17:57:25 +0200 Subject: [PATCH 2/3] pythonPackages.spyder-kernels: 0.4.2 -> 0.4.4 --- .../python-modules/spyder-kernels/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 27da324a29b3..a3aaa942a9be 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -1,18 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer }: +{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, + jupyter_client, pyzmq }: buildPythonPackage rec { pname = "spyder-kernels"; - version = "0.4.2"; + version = "0.4.4"; src = fetchPypi { inherit pname version; - sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b"; + sha256 = "0g3754s71cnh7kygps6gbzrhs5gb47p3pblr7hcvxk1mzl3xw94r"; }; propagatedBuildInputs = [ cloudpickle ipykernel wurlitzer + jupyter_client + pyzmq ]; # No tests From 8f4ae93be3f6ebe91a9b8eadc3f80bcca22cbde8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 21 May 2019 18:06:59 +0200 Subject: [PATCH 3/3] spyder: 3.3.3 -> 3.3.4 --- .../development/python-modules/spyder/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index a368d7704c90..406cd6e8627f 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,20 +1,21 @@ { stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, - qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, - spyder-kernels }: + qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, + spyder-kernels, qtpy, pyzmq, chardet }: buildPythonPackage rec { pname = "spyder"; - version = "3.3.3"; + version = "3.3.4"; src = fetchPypi { inherit pname version; - sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba"; + sha256 = "1fa5yhw0sjk5qydydp76scyxd8lvyciknq0vajnq0mxhhvfig3ra"; }; propagatedBuildInputs = [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels + pygments qtpy pyzmq chardet ]; # There is no test for spyder @@ -30,6 +31,12 @@ buildPythonPackage rec { categories = "Application;Development;Editor;IDE;"; }; + postPatch = '' + # remove dependency on pyqtwebengine + # this is still part of the pyqt 5.11 version we have in nixpkgs + sed -i /pyqtwebengine/d setup.py + ''; + # Create desktop item postInstall = '' mkdir -p $out/share/icons