Merge pull request #22367 from dalthviz/update-core-deps-600rc2

PR: Update core dependencies for 6.0.0rc2
spyder-ide · Aug 22, 2024 · ac00af1 · ac00af1
2 parents 48e5319 + c4e462d
commit ac00af1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -50,7 +50,7 @@ dependencies:
 - rtree >=0.9.7
 - setuptools >=49.6.0
 - sphinx >=0.6.6
-- spyder-kernels >=3.0.0b8,<3.0.0b9
+- spyder-kernels >=3.0.0b9,<3.0.0b10
 - superqt >=0.6.2,<1.0.0
 - textdistance >=4.2.0
 - three-merge >=0.1.1

diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo
diff --git a/external-deps/spyder-kernels/CHANGELOG.md b/external-deps/spyder-kernels/CHANGELOG.md
diff --git a/requirements/main.yml b/requirements/main.yml
@@ -47,7 +47,7 @@ dependencies:
   - rtree >=0.9.7
   - setuptools >=49.6.0
   - sphinx >=0.6.6
-  - spyder-kernels >=3.0.0b8,<3.0.0b9
+  - spyder-kernels >=3.0.0b9,<3.0.0b10
   - superqt >=0.6.2,<1.0.0
   - textdistance >=4.2.0
   - three-merge >=0.1.1

diff --git a/setup.py b/setup.py
@@ -247,7 +247,7 @@ def run(self):
     'rtree>=0.9.7',
     'setuptools>=49.6.0',
     'sphinx>=0.6.6',
-    'spyder-kernels>=3.0.0b8,<3.0.0b9',
+    'spyder-kernels>=3.0.0b9,<3.0.0b10',
     'superqt>=0.6.2,<1.0.0',
     'textdistance>=4.2.0',
     'three-merge>=0.1.1',
@@ -262,7 +262,7 @@ def run(self):
                         if req.split(">")[0] not in reqs_to_loosen]
     install_requires.append('python-lsp-server[all]>=1.11.0,<1.13.0')
     install_requires.append('qtconsole>=5.5.1,<5.7.0')
-    install_requires.append('spyder-kernels>=3.0.0b8,<3.1.0')
+    install_requires.append('spyder-kernels>=3.0.0b9,<3.1.0')
 
 extras_require = {
     'test:platform_system == "Windows"': ['pywin32'],

diff --git a/spyder/dependencies.py b/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.0b8,<3.0.0b9'
+SPYDER_KERNELS_REQVER = '>=3.0.0b9,<3.0.0b10'
 SUPERQT_REQVER = '>=0.6.2,<1.0.0'
 TEXTDISTANCE_REQVER = '>=4.2.0'
 THREE_MERGE_REQVER = '>=0.1.1'

diff --git a/spyder/plugins/ipythonconsole/__init__.py b/spyder/plugins/ipythonconsole/__init__.py
@@ -20,10 +20,10 @@
 
 # Required version of Spyder-kernels
 SPYDER_KERNELS_MIN_VERSION = (
-    '3.0.0b8' if not running_under_pytest() else '3.0.0.dev0'
+    '3.0.0b9' if not running_under_pytest() else '3.0.0.dev0'
 )
 SPYDER_KERNELS_MAX_VERSION = (
-    '3.0.0b9' if not running_under_pytest() else '4.0.0'
+    '3.0.0b10' if not running_under_pytest() else '4.0.0'
 )
 SPYDER_KERNELS_VERSION = (
     f'>={SPYDER_KERNELS_MIN_VERSION},<{SPYDER_KERNELS_MAX_VERSION}'