Skip to content

Commit

Permalink
Merge pull request #21628 from dalthviz/update-core-deps-600a3
Browse files Browse the repository at this point in the history
PR: Update core dependencies for 6.0.0.alpha3
  • Loading branch information
ccordoba12 authored Dec 19, 2023
2 parents 3979b8e + 0a58fde commit 9b40917
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 9 deletions.
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=3.0.0b2,<3.0.0b3
- spyder-kernels >=3.0.0b3,<3.0.0b4
- superqt >=0.6.1,<1.0.0
- textdistance >=4.2.0
- three-merge >=0.1.1
Expand Down
4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/.gitrepo

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions external-deps/spyder-kernels/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions external-deps/spyder-kernels/spyder_kernels/comms/commbase.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion requirements/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=3.0.0b2,<3.0.0b3
- spyder-kernels >=3.0.0b3,<3.0.0b4
- superqt >=0.6.1,<1.0.0
- textdistance >=4.2.0
- three-merge >=0.1.1
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def run(self):
'rtree>=0.9.7',
'setuptools>=49.6.0',
'sphinx>=0.6.6',
'spyder-kernels>=3.0.0b2,<3.0.0b3',
'spyder-kernels>=3.0.0b3,<3.0.0b4',
'superqt>=0.6.1,<1.0.0',
'textdistance>=4.2.0',
'three-merge>=0.1.1',
Expand All @@ -257,7 +257,7 @@ def run(self):
if req.split(">")[0] not in reqs_to_loosen]
install_requires.append('python-lsp-server[all]>=1.9.0,<1.11.0')
install_requires.append('qtconsole>=5.5.0,<5.7.0')
install_requires.append('spyder-kernels>=3.0.0b2,<3.1.0')
install_requires.append('spyder-kernels>=3.0.0b3,<3.1.0')

extras_require = {
'test:platform_system == "Windows"': ['pywin32'],
Expand Down
2 changes: 1 addition & 1 deletion spyder/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
RTREE_REQVER = '>=0.9.7'
SETUPTOOLS_REQVER = '>=49.6.0'
SPHINX_REQVER = '>=0.6.6'
SPYDER_KERNELS_REQVER = '>=3.0.0b2,<3.0.0b3'
SPYDER_KERNELS_REQVER = '>=3.0.0b3,<3.0.0b4'
SUPERQT_REQVER = '>=0.6.1,<1.0.0'
TEXTDISTANCE_REQVER = '>=4.2.0'
THREE_MERGE_REQVER = '>=0.1.1'
Expand Down
4 changes: 2 additions & 2 deletions spyder/plugins/ipythonconsole/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

# Required version of Spyder-kernels
SPYDER_KERNELS_MIN_VERSION = (
'3.0.0b2' if not running_under_pytest() else '3.0.0.dev0')
'3.0.0b3' if not running_under_pytest() else '3.0.0.dev0')
SPYDER_KERNELS_MAX_VERSION = (
'3.0.0b3' if not running_under_pytest() else '4.0.0')
'3.0.0b4' if not running_under_pytest() else '4.0.0')
SPYDER_KERNELS_VERSION = (
f'>={SPYDER_KERNELS_MIN_VERSION},<{SPYDER_KERNELS_MAX_VERSION}')

Expand Down

0 comments on commit 9b40917

Please sign in to comment.