devel/py-spyder: Adaptions for py-spyder-kernels

The new devel/py-spyder-kernels v2.4.0 seems to work fine with this
version of Spyder.

Agreed with:  yuri@ (maintainer)

5 files changed, 37 insertions, 7 deletions

diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile
index 3194f76d7189..1aeb4b89d2b5 100644
--- a/devel/py-spyder/Makefile
+++ b/devel/py-spyder/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	spyder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/devel/py-spyder/files/patch-binder_environment.yml b/devel/py-spyder/files/patch-binder_environment.yml
index f5f454102ee9..8bf4bcbdb80a 100644
--- a/devel/py-spyder/files/patch-binder_environment.yml
+++ b/devel/py-spyder/files/patch-binder_environment.yml
@@ -1,6 +1,6 @@
---- binder/environment.yml.orig	2022-10-14 18:00:34 UTC
+--- binder/environment.yml.orig	2022-08-29 23:48:19 UTC
 +++ binder/environment.yml
-@@ -33,7 +33,7 @@ dependencies:
+@@ -33,7 +33,7 @@ - pyzmq >=22.1.0
  - python-lsp-server >=1.5.0,<1.6.0
  - pyxdg >=0.26
  - pyzmq >=22.1.0
@@ -9,3 +9,12 @@
  - qstylizer >=0.1.10
  - qtawesome >=1.0.2
  - qtconsole >=5.3.2,<5.4.0
+@@ -41,7 +41,7 @@ - sphinx >=0.6.6
+ - rtree >=0.9.7
+ - setuptools >=49.6.0
+ - sphinx >=0.6.6
+-- spyder-kernels >=2.3.3,<2.4.0
++- spyder-kernels >=2.3.3,<2.4.1
+ - textdistance >=4.2.0
+ - three-merge >=0.1.1
+ - watchdog >=0.10.3
diff --git a/devel/py-spyder/files/patch-requirements_main.yml b/devel/py-spyder/files/patch-requirements_main.yml
index cab30c18def6..9cd3f6a77a11 100644
--- a/devel/py-spyder/files/patch-requirements_main.yml
+++ b/devel/py-spyder/files/patch-requirements_main.yml
@@ -1,4 +1,4 @@
---- requirements/main.yml.orig	2022-10-14 17:58:24 UTC
+--- requirements/main.yml.orig	2022-08-29 23:48:19 UTC
 +++ requirements/main.yml
 @@ -30,7 +30,7 @@ dependencies:
    - python-lsp-black >=1.2.0
@@ -9,3 +9,12 @@
    - qstylizer >=0.1.10
    - qtawesome >=1.0.2
    - qtconsole >=5.3.2,<5.4.0
+@@ -38,7 +38,7 @@ dependencies:
+   - rtree >=0.9.7
+   - setuptools >=49.6.0
+   - sphinx >=0.6.6
+-  - spyder-kernels >=2.3.3,<2.4.0
++  - spyder-kernels >=2.3.3,<2.4.1
+   - textdistance >=4.2.0
+   - three-merge >=0.1.1
+   - watchdog >=0.10.3
diff --git a/devel/py-spyder/files/patch-setup.py b/devel/py-spyder/files/patch-setup.py
index 0fcd7d5de7a7..c8d2aefccc70 100644
--- a/devel/py-spyder/files/patch-setup.py
+++ b/devel/py-spyder/files/patch-setup.py
@@ -17,7 +17,7 @@
  )
  
  
-@@ -229,12 +228,12 @@ install_requires = [
+@@ -229,17 +228,17 @@ install_requires = [
      'pyqt5<5.16',
      'pyqtwebengine<5.16',
      'python-lsp-server[all]>=1.5.0,<1.6.0',
@@ -33,3 +33,9 @@
      'qtpy>=2.1.0',
      'rtree>=0.9.7',
      'setuptools>=49.6.0',
+     'sphinx>=0.6.6',
+-    'spyder-kernels>=2.3.3,<2.4.0',
++    'spyder-kernels>=2.3.3,<2.4.1',
+     'textdistance>=4.2.0',
+     'three-merge>=0.1.1',
+     'watchdog>=0.10.3'
diff --git a/devel/py-spyder/files/patch-spyder_dependencies.py b/devel/py-spyder/files/patch-spyder_dependencies.py
index 21723e2a6c1f..a6ab54dc79a7 100644
--- a/devel/py-spyder/files/patch-spyder_dependencies.py
+++ b/devel/py-spyder/files/patch-spyder_dependencies.py
@@ -1,6 +1,6 @@
---- spyder/dependencies.py.orig	2022-10-15 07:03:54 UTC
+--- spyder/dependencies.py.orig	2022-08-29 23:48:19 UTC
 +++ spyder/dependencies.py
-@@ -57,10 +57,10 @@ PYLSP_BLACK_REQVER = '>=1.2.0'
+@@ -57,15 +57,15 @@ PYZMQ_REQVER = '>=22.1.0'
  PYLS_SPYDER_REQVER = '>=0.4.0'
  PYXDG_REQVER = '>=0.26'
  PYZMQ_REQVER = '>=22.1.0'
@@ -13,3 +13,9 @@
  QTPY_REQVER = '>=2.1.0'
  RTREE_REQVER = '>=0.9.7'
  SETUPTOOLS_REQVER = '>=49.6.0'
+ SPHINX_REQVER = '>=0.6.6'
+-SPYDER_KERNELS_REQVER = '>=2.3.3;<2.4.0'
++SPYDER_KERNELS_REQVER = '>=2.3.3;<2.4.1'
+ TEXTDISTANCE_REQVER = '>=4.2.0'
+ THREE_MERGE_REQVER = '>=0.1.1'
+ # None for pynsist install for now