Skip to content

Commit

Permalink
Merge pull request #22162 from dalthviz/update-core-deps-555
Browse files Browse the repository at this point in the history
PR: Update core dependencies for 5.5.5
  • Loading branch information
dalthviz authored Jun 11, 2024
2 parents cbb94d1 + 1210adb commit 6b14487
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion binder/environment.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 >=2.5.1,<2.6.0
- spyder-kernels >=2.5.2,<2.6.0
- textdistance >=4.2.0
- three-merge >=0.1.1
- watchdog >=0.10.3
Expand Down
6 changes: 3 additions & 3 deletions external-deps/spyder-kernels/.gitrepo

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

12 changes: 12 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.

2 changes: 1 addition & 1 deletion requirements/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=2.5.1,<2.6.0
- spyder-kernels >=2.5.2,<2.6.0
- textdistance >=4.2.0
- three-merge >=0.1.1
- watchdog >=0.10.3
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>=2.5.1,<2.6.0',
'spyder-kernels>=2.5.2,<2.6.0',
'textdistance>=4.2.0',
'three-merge>=0.1.1',
'watchdog>=0.10.3'
Expand All @@ -256,7 +256,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>=2.5.1,<2.7.0')
install_requires.append('spyder-kernels>=2.5.2,<2.7.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 @@ -71,7 +71,7 @@
RTREE_REQVER = '>=0.9.7'
SETUPTOOLS_REQVER = '>=49.6.0'
SPHINX_REQVER = '>=0.6.6'
SPYDER_KERNELS_REQVER = '>=2.5.1,<2.6.0'
SPYDER_KERNELS_REQVER = '>=2.5.2,<2.6.0'
TEXTDISTANCE_REQVER = '>=4.2.0'
THREE_MERGE_REQVER = '>=0.1.1'
# None for pynsist install for now
Expand Down

0 comments on commit 6b14487

Please sign in to comment.