spyder: 5.5.6 -> 6.0.0 (#339189)

pkgs/development/python-modules/qtconsole/default.nix

@@ -1,30 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   ipykernel,
   jupyter-core,
   jupyter-client,
   pygments,
   pyqt5,
-  pytestCheckHook,
-  pythonOlder,
-  pyzmq,
   qtpy,
-  setuptools,
   traitlets,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "5.5.2";
+  version = "5.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-a1+xEnSyl0Y3Bq+E3LvVySJzsfYZ5tJdCIdLCohRaYk=";
+  src = fetchFromGitHub {
+    owner = "jupyter";
+    repo = "qtconsole";
+    rev = "refs/tags/${version}";
+    hash = "sha256-V82tGAmpvfGeUoewtJXXsBBXx2HNcV9/IMJxJg3bJL8=";
   };
 
   build-system = [ setuptools ];
@@ -35,7 +39,6 @@ buildPythonPackage rec {
     jupyter-client
     pygments
     pyqt5
-    pyzmq
     qtpy
     traitlets
   ];
@@ -47,11 +50,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "qtconsole" ];
 
-  meta = with lib; {
+  meta = {
     description = "Jupyter Qt console";
     mainProgram = "jupyter-qtconsole";
     homepage = "https://qtconsole.readthedocs.io/";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
+    changelog = "https://qtconsole.readthedocs.io/en/stable/changelog.html#changes-in-jupyter-qt-console";
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

pkgs/development/python-modules/spyder-kernels/default.nix

@@ -1,14 +1,16 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
   cloudpickle,
-  fetchPypi,
   ipykernel,
   ipython,
   jupyter-client,
-  packaging,
-  pythonOlder,
   pyxdg,
   pyzmq,
   wurlitzer,
@@ -16,15 +18,14 @@
 
 buildPythonPackage rec {
   pname = "spyder-kernels";
-  version = "2.5.2";
+  version = "3.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    pname = "spyder_kernels";
-    inherit version;
-    hash = "sha256-cfJSkA4CsDlIIMxwSfie1yUkP2/M9kC3bdMpIDxBOWA=";
+  src = fetchFromGitHub {
+    owner = "spyder-ide";
+    repo = "spyder-kernels";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-oyPgujvaj2tqouZKuMVDq3gxm0GNrKmeUWqUFUkEMB4=";
   };
 
   build-system = [ setuptools ];
@@ -34,7 +35,6 @@ buildPythonPackage rec {
     ipykernel
     ipython
     jupyter-client
-    packaging
     pyxdg
     pyzmq
     wurlitzer

pkgs/development/python-modules/spyder/default.nix

@@ -5,11 +5,14 @@
   pythonOlder,
 
   # dependencies
+  aiohttp,
+  asyncssh,
   atomicwrites,
   chardet,
   cloudpickle,
   cookiecutter,
   diff-match-patch,
+  fzf,
   intervaltree,
   jedi,
   jellyfish,
@@ -20,6 +23,7 @@
   numpydoc,
   pickleshare,
   psutil,
+  pygithub,
   pygments,
   pylint-venv,
   pyls-spyder,
@@ -27,7 +31,7 @@
   pyqtwebengine,
   python-lsp-black,
   python-lsp-server,
-  pyxdg,
+  pyuca,
   pyzmq,
   qdarkstyle,
   qstylizer,
@@ -39,21 +43,21 @@
   scipy,
   setuptools,
   spyder-kernels,
+  superqt,
   textdistance,
   three-merge,
   watchdog,
+  yarl,
 }:
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "5.5.6";
+  version = "6.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lYtmn0oBXFw5EFDrbv+o2EZWqL/Eel9GrbopeEnYK90=";
+    hash = "sha256-/UUtSpSkt1hJeIZfBLe8owP82jRx02kUF6TdfCsq6CY=";
   };
 
   patches = [ ./dont-clear-pythonpath.patch ];
@@ -64,11 +68,14 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    aiohttp
+    asyncssh
     atomicwrites
     chardet
     cloudpickle
     cookiecutter
     diff-match-patch
+    fzf
     intervaltree
     jedi
     jellyfish
@@ -79,6 +86,7 @@ buildPythonPackage rec {
     numpydoc
     pickleshare
     psutil
+    pygithub
     pygments
     pylint-venv
     pyls-spyder
@@ -86,7 +94,7 @@ buildPythonPackage rec {
     pyqtwebengine
     python-lsp-black
     python-lsp-server
-    pyxdg
+    pyuca
     pyzmq
     qdarkstyle
     qstylizer
@@ -97,9 +105,11 @@ buildPythonPackage rec {
     rtree
     scipy
     spyder-kernels
+    superqt
     textdistance
     three-merge
     watchdog
+    yarl
   ] ++ python-lsp-server.optional-dependencies.all;
 
   # There is no test for spyder

pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch

@@ -1,25 +1,21 @@
 diff --git a/spyder/app/start.py b/spyder/app/start.py
-index 97b08a600..66486e510 100644
+index ad9f2b8d0..442b4fc46 100644
 --- a/spyder/app/start.py
 +++ b/spyder/app/start.py
-@@ -6,20 +6,8 @@
+@@ -6,16 +6,8 @@
  # (see spyder/__init__.py for details)
  # -----------------------------------------------------------------------------
-
+ 
 -# Remove PYTHONPATH paths from sys.path before other imports to protect against
 -# shadowed standard libraries.
  import os
  import sys
 -if os.environ.get('PYTHONPATH'):
 -    for path in os.environ['PYTHONPATH'].split(os.pathsep):
--        if os.name == 'nt' and 'pkgs' in path:
--            # Don't remove pynsist installer entry for 'pkgs' directory
--            continue
--        else:
--            try:
--                sys.path.remove(path.rstrip(os.sep))
--            except ValueError:
--                pass
-
+-        try:
+-            sys.path.remove(path.rstrip(os.sep))
+-        except ValueError:
+-            pass
+ 
  # Standard library imports
  import ctypes