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

PR: Update core dependencies for 6.0.0
spyder-ide · Aug 31, 2024 · 9ff6ca5 · 9ff6ca5
2 parents 1e29c10 + f91912b
commit 9ff6ca5
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 26 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -45,12 +45,12 @@ dependencies:
 - qdarkstyle >=3.2.0,<3.3.0
 - qstylizer >=0.2.2
 - qtawesome >=1.3.1,<1.4.0
-- qtconsole >=5.5.1,<5.6.0
+- qtconsole >=5.6.0,<5.7.0
 - qtpy >=2.4.0
 - rtree >=0.9.7
 - setuptools >=49.6.0
 - sphinx >=0.6.6,<7.4.0
-- spyder-kernels >=3.0.0b9,<3.0.0b10
+- spyder-kernels >=3.0.0,<3.1.0
 - superqt >=0.6.2,<1.0.0
 - textdistance >=4.2.0
 - three-merge >=0.1.1

diff --git a/external-deps/qtconsole/.gitrepo b/external-deps/qtconsole/.gitrepo
diff --git a/external-deps/qtconsole/RELEASE.md b/external-deps/qtconsole/RELEASE.md
diff --git a/external-deps/qtconsole/docs/source/changelog.rst b/external-deps/qtconsole/docs/source/changelog.rst
diff --git a/external-deps/qtconsole/qtconsole/_version.py b/external-deps/qtconsole/qtconsole/_version.py
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/external-deps/spyder-kernels/RELEASE.md b/external-deps/spyder-kernels/RELEASE.md
diff --git a/external-deps/spyder-kernels/spyder_kernels/_version.py b/external-deps/spyder-kernels/spyder_kernels/_version.py
diff --git a/requirements/main.yml b/requirements/main.yml
@@ -42,12 +42,12 @@ dependencies:
   - qdarkstyle >=3.2.0,<3.3.0
   - qstylizer >=0.2.2
   - qtawesome >=1.3.1,<1.4.0
-  - qtconsole >=5.5.1,<5.6.0
+  - qtconsole >=5.6.0,<5.7.0
   - qtpy >=2.4.0
   - rtree >=0.9.7
   - setuptools >=49.6.0
   - sphinx >=0.6.6,<7.4.0
-  - spyder-kernels >=3.0.0b9,<3.0.0b10
+  - spyder-kernels >=3.0.0,<3.1.0
   - superqt >=0.6.2,<1.0.0
   - textdistance >=4.2.0
   - three-merge >=0.1.1

diff --git a/setup.py b/setup.py
@@ -242,12 +242,12 @@ def run(self):
     'qdarkstyle>=3.2.0,<3.3.0',
     'qstylizer>=0.2.2',
     'qtawesome>=1.3.1,<1.4.0',
-    'qtconsole>=5.5.1,<5.6.0',
+    'qtconsole>=5.6.0,<5.7.0',
     'qtpy>=2.4.0',
     'rtree>=0.9.7',
     'setuptools>=49.6.0',
     'sphinx>=0.6.6,<7.4.0',
-    'spyder-kernels>=3.0.0b9,<3.0.0b10',
+    'spyder-kernels>=3.0.0,<3.1.0',
     '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.12.0,<1.14.0')
     install_requires.append('qtconsole>=5.5.1,<5.7.0')
-    install_requires.append('spyder-kernels>=3.0.0b9,<3.1.0')
+    install_requires.append('spyder-kernels>=3.0.0,<3.2.0')
 
 extras_require = {
     'test:platform_system == "Windows"': ['pywin32'],

diff --git a/spyder/dependencies.py b/spyder/dependencies.py
@@ -68,12 +68,12 @@
 QDARKSTYLE_REQVER = '>=3.2.0,<3.3.0'
 QSTYLIZER_REQVER = '>=0.2.2'
 QTAWESOME_REQVER = '>=1.3.1,<1.4.0'
-QTCONSOLE_REQVER = '>=5.5.1,<5.6.0'
+QTCONSOLE_REQVER = '>=5.6.0,<5.7.0'
 QTPY_REQVER = '>=2.4.0'
 RTREE_REQVER = '>=0.9.7'
 SETUPTOOLS_REQVER = '>=49.6.0'
 SPHINX_REQVER = '>=0.6.6,<7.4.0'
-SPYDER_KERNELS_REQVER = '>=3.0.0b9,<3.0.0b10'
+SPYDER_KERNELS_REQVER = '>=3.0.0,<3.1.0'
 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.0b9' if not running_under_pytest() else '3.0.0.dev0'
+    '3.0.0' if not running_under_pytest() else '3.1.0.dev0'
 )
 SPYDER_KERNELS_MAX_VERSION = (
-    '3.0.0b10' if not running_under_pytest() else '4.0.0'
+    '3.1.0' if not running_under_pytest() else '4.0.0'
 )
 SPYDER_KERNELS_VERSION = (
     f'>={SPYDER_KERNELS_MIN_VERSION},<{SPYDER_KERNELS_MAX_VERSION}'