Merge pull request #23201 from dalthviz/update-spyder-kernels-603

PR: Update `spyder-kernels` to 3.0.2 and add constraint for `pyqt5-sip` on Python 3.8

binder/environment.yml

@@ -50,7 +50,7 @@ dependencies:
 - rtree >=0.9.7
 - setuptools >=49.6.0
 - sphinx >=0.6.6
-- spyder-kernels >=3.0.1,<3.1.0
+- spyder-kernels >=3.0.2,<3.1.0
 - superqt >=0.6.2,<1.0.0
 - textdistance >=4.2.0
 - three-merge >=0.1.1

requirements/main.yml

@@ -47,7 +47,7 @@ dependencies:
   - rtree >=0.9.7
   - setuptools >=49.6.0
   - sphinx >=0.6.6
-  - spyder-kernels >=3.0.1,<3.1.0
+  - spyder-kernels >=3.0.2,<3.1.0
   - superqt >=0.6.2,<1.0.0
   - textdistance >=4.2.0
   - three-merge >=0.1.1

setup.py

@@ -244,7 +244,7 @@ def run(self):
 
 # Qt bindings requirements
 qt_requirements = {
-    'pyqt5': ['pyqt5>=5.15,<5.16', 'pyqtwebengine>=5.15,<5.16'],
+    'pyqt5': ['pyqt5>=5.15,<5.16', 'pyqtwebengine>=5.15,<5.16', 'pyqt5-sip<12.16; python_version=="3.8"'],
     'pyqt6': ['pyqt6>=6.5,<7', 'pyqt6-webengine>=6.5,<7'],
 }
 
@@ -294,7 +294,7 @@ def run(self):
     'rtree>=0.9.7',
     'setuptools>=49.6.0',
     'sphinx>=0.6.6',
-    'spyder-kernels>=3.0.1,<3.1.0',
+    'spyder-kernels>=3.0.2,<3.1.0',
     'superqt>=0.6.2,<1.0.0',
     'textdistance>=4.2.0',
     'three-merge>=0.1.1',

spyder/dependencies.py

@@ -73,7 +73,7 @@
 RTREE_REQVER = '>=0.9.7'
 SETUPTOOLS_REQVER = '>=49.6.0'
 SPHINX_REQVER = '>=0.6.6'
-SPYDER_KERNELS_REQVER = '>=3.0.1,<3.1.0'
+SPYDER_KERNELS_REQVER = '>=3.0.2,<3.1.0'
 SUPERQT_REQVER = '>=0.6.2,<1.0.0'
 TEXTDISTANCE_REQVER = '>=4.2.0'
 THREE_MERGE_REQVER = '>=0.1.1'

spyder/tests/test_dependencies_in_sync.py

@@ -237,6 +237,8 @@ def test_dependencies_for_spyder_setup_install_requires_in_sync():
     # We can't declare these as dependencies in setup.py
     for dep in ['python.app', 'fzf', 'fcitx-qt5']:
         full_reqs.pop(dep)
+    # Ignored `pyqt5-sip` constraint on conda
+    spyder_setup.pop('pyqt5-sip')
 
     assert spyder_setup == full_reqs