From 3044a217eb2b7632ebbbc7f569bd731f05017413 Mon Sep 17 00:00:00 2001
From: Rainer Hurling <rhurlin@FreeBSD.org>
Date: Tue, 12 Dec 2023 17:56:29 +0100
Subject: [PATCH] devel/spyder: Relax dependency restrictions

Again, spyder has to widen its restrictions because of newer versions
of textproc/py-QDarkStyle and devel/py-spyder-kernels.
---
 .../spyder/files/patch-binder_environment.yml | 18 +++++++++++--
 .../spyder/files/patch-requirements_main.yml  | 17 ++++++++++--
 devel/spyder/files/patch-setup.py             | 27 +++++++++++++++++--
 .../spyder/files/patch-spyder_dependencies.py | 18 ++++++++++++-
 4 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/devel/spyder/files/patch-binder_environment.yml b/devel/spyder/files/patch-binder_environment.yml
index 3e0d75249efaf..ffb4f4a9eb32f 100644
--- a/devel/spyder/files/patch-binder_environment.yml
+++ b/devel/spyder/files/patch-binder_environment.yml
@@ -9,7 +9,7 @@
  - jellyfish >=0.7
  - jsonschema >=3.2.0
  - keyring >=17.0.0
-@@ -31,7 +31,7 @@ - python-lsp-black >=1.2.0,<3.0.0
+@@ -31,18 +31,18 @@ - python-lsp-black >=1.2.0,<3.0.0
  - pyqt <5.16
  - pyqtwebengine <5.16
  - python-lsp-black >=1.2.0,<3.0.0
@@ -17,4 +17,18 @@
 +- python-lsp-server >=1.7.4
  - pyxdg >=0.26
  - pyzmq >=22.1.0
- - qdarkstyle >=3.0.2,<3.2.0
+-- qdarkstyle >=3.0.2,<3.2.0
++- qdarkstyle >=3.0.2
+ - qstylizer >=0.2.2
+ - qtawesome >=1.2.1
+-- qtconsole >=5.4.2,<5.5.0
++- qtconsole >=5.4.2
+ - qtpy >=2.1.0
+ - rtree >=0.9.7
+ - setuptools >=49.6.0
+ - sphinx >=0.6.6
+-- spyder-kernels >=2.4.4,<2.5.0
++- spyder-kernels >=2.4.4
+ - textdistance >=4.2.0
+ - three-merge >=0.1.1
+ - watchdog >=0.10.3
diff --git a/devel/spyder/files/patch-requirements_main.yml b/devel/spyder/files/patch-requirements_main.yml
index e59fb0942f784..3fab70d7138b4 100644
--- a/devel/spyder/files/patch-requirements_main.yml
+++ b/devel/spyder/files/patch-requirements_main.yml
@@ -9,12 +9,25 @@
    - jellyfish >=0.7
    - jsonschema >=3.2.0
    - keyring >=17.0.0
-@@ -29,7 +29,7 @@ dependencies:
+@@ -29,17 +29,17 @@ dependencies:
    - pyqt <5.16
    - pyqtwebengine <5.16
    - python-lsp-black >=1.2.0,<3.0.0
 -  - python-lsp-server >=1.7.4,<1.8.0
 +  - python-lsp-server >=1.7.4
    - pyzmq >=22.1.0
-   - qdarkstyle >=3.0.2,<3.2.0
+-  - qdarkstyle >=3.0.2,<3.2.0
++  - qdarkstyle >=3.0.2
    - qstylizer >=0.2.2
+   - qtawesome >=1.2.1
+-  - qtconsole >=5.4.2,<5.5.0
++  - qtconsole >=5.4.2
+   - qtpy >=2.1.0
+   - rtree >=0.9.7
+   - setuptools >=49.6.0
+   - sphinx >=0.6.6
+-  - spyder-kernels >=2.4.4,<2.5.0
++  - spyder-kernels >=2.4.4
+   - textdistance >=4.2.0
+   - three-merge >=0.1.1
+   - watchdog >=0.10.3
diff --git a/devel/spyder/files/patch-setup.py b/devel/spyder/files/patch-setup.py
index a953aa7b10f89..01491362a48d6 100644
--- a/devel/spyder/files/patch-setup.py
+++ b/devel/spyder/files/patch-setup.py
@@ -26,7 +26,7 @@
      'jellyfish>=0.7',
      'jsonschema>=3.2.0',
      'keyring>=17.0.0',
-@@ -229,7 +228,7 @@ install_requires = [
+@@ -229,18 +228,18 @@ install_requires = [
      'pyls-spyder>=0.4.0',
      'pyqt5<5.16',
      'pyqtwebengine<5.16',
@@ -34,4 +34,27 @@
 +    'python-lsp-server[all]>=1.7.4',
      'pyxdg>=0.26;platform_system=="Linux"',
      'pyzmq>=22.1.0',
-     'qdarkstyle>=3.0.2,<3.2.0',
+-    'qdarkstyle>=3.0.2,<3.2.0',
++    'qdarkstyle>=3.0.2',
+     'qstylizer>=0.2.2',
+     'qtawesome>=1.2.1',
+-    'qtconsole>=5.4.2,<5.5.0',
++    'qtconsole>=5.4.2',
+     'qtpy>=2.1.0',
+     'rtree>=0.9.7',
+     'setuptools>=49.6.0',
+     'sphinx>=0.6.6',
+-    'spyder-kernels>=2.4.4,<2.5.0',
++    'spyder-kernels>=2.4.4',
+     'textdistance>=4.2.0',
+     'three-merge>=0.1.1',
+     'watchdog>=0.10.3'
+@@ -253,7 +252,7 @@ if 'dev' in __version__:
+                         if req.split(">")[0] not in reqs_to_loosen]
+     install_requires.append('python-lsp-server[all]>=1.7.4,<1.9.0')
+     install_requires.append('qtconsole>=5.4.2,<5.6.0')
+-    install_requires.append('spyder-kernels>=2.4.4,<2.6.0')
++    install_requires.append('spyder-kernels>=2.4.4')
+ 
+ extras_require = {
+     'test:platform_system == "Windows"': ['pywin32'],
diff --git a/devel/spyder/files/patch-spyder_dependencies.py b/devel/spyder/files/patch-spyder_dependencies.py
index 434dac95f9bff..ecd7f92f230bc 100644
--- a/devel/spyder/files/patch-spyder_dependencies.py
+++ b/devel/spyder/files/patch-spyder_dependencies.py
@@ -9,7 +9,7 @@
  JELLYFISH_REQVER = '>=0.7'
  JSONSCHEMA_REQVER = '>=3.2.0'
  KEYRING_REQVER = '>=17.0.0'
-@@ -54,7 +54,7 @@ PYLINT_VENV_REQVER = '>=3.0.2'
+@@ -54,20 +54,20 @@ PYLINT_VENV_REQVER = '>=3.0.2'
  PYGMENTS_REQVER = '>=2.0'
  PYLINT_REQVER = '>=2.5.0,<3.0'
  PYLINT_VENV_REQVER = '>=3.0.2'
@@ -18,3 +18,19 @@
  PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0'
  PYLS_SPYDER_REQVER = '>=0.4.0'
  PYXDG_REQVER = '>=0.26'
+ PYZMQ_REQVER = '>=22.1.0'
+-QDARKSTYLE_REQVER = '>=3.0.2,<3.2.0'
++QDARKSTYLE_REQVER = '>=3.0.2'
+ QSTYLIZER_REQVER = '>=0.2.2'
+ QTAWESOME_REQVER = '>=1.2.1'
+-QTCONSOLE_REQVER = '>=5.4.2,<5.5.0'
++QTCONSOLE_REQVER = '>=5.4.2'
+ QTPY_REQVER = '>=2.1.0'
+ RTREE_REQVER = '>=0.9.7'
+ SETUPTOOLS_REQVER = '>=49.6.0'
+ SPHINX_REQVER = '>=0.6.6'
+-SPYDER_KERNELS_REQVER = '>=2.4.4,<2.5.0'
++SPYDER_KERNELS_REQVER = '>=2.4.4'
+ TEXTDISTANCE_REQVER = '>=4.2.0'
+ THREE_MERGE_REQVER = '>=0.1.1'
+ # None for pynsist install for now