Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PR: Update core dependencies for 6.0.0 rc1 #22336

Merged
merged 2 commits into from
Aug 8, 2024
Merged

PR: Update core dependencies for 6.0.0 rc1 #22336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44ddec1
Update core dependencies
dalthviz Aug 8, 2024
812cfab
git subrepo pull external-deps/spyder-kernels
dalthviz Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion binder/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=3.0.0b7,<3.0.0b8
- spyder-kernels >=3.0.0b8,<3.0.0b9
- superqt >=0.6.2,<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
View file
Open in desktop

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

10 changes: 10 additions & 0 deletions external-deps/spyder-kernels/CHANGELOG.md
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=3.0.0b7,<3.0.0b8
- spyder-kernels >=3.0.0b8,<3.0.0b9
- superqt >=0.6.2,<1.0.0
- textdistance >=4.2.0
- three-merge >=0.1.1
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def run(self):
'rtree>=0.9.7',
'setuptools>=49.6.0',
'sphinx>=0.6.6',
'spyder-kernels>=3.0.0b7,<3.0.0b8',
'spyder-kernels>=3.0.0b8,<3.0.0b9',
'superqt>=0.6.2,<1.0.0',
'textdistance>=4.2.0',
'three-merge>=0.1.1',
Expand All @@ -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.0b7,<3.1.0')
install_requires.append('spyder-kernels>=3.0.0b8,<3.1.0')

extras_require = {
'test:platform_system == "Windows"': ['pywin32'],
Expand Down
2 changes: 1 addition & 1 deletion spyder/dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
RTREE_REQVER = '>=0.9.7'
SETUPTOOLS_REQVER = '>=49.6.0'
SPHINX_REQVER = '>=0.6.6'
SPYDER_KERNELS_REQVER = '>=3.0.0b7,<3.0.0b8'
SPYDER_KERNELS_REQVER = '>=3.0.0b8,<3.0.0b9'
SUPERQT_REQVER = '>=0.6.2,<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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

# Required version of Spyder-kernels
SPYDER_KERNELS_MIN_VERSION = (
'3.0.0b7' if not running_under_pytest() else '3.0.0.dev0'
'3.0.0b8' if not running_under_pytest() else '3.0.0.dev0'
)
SPYDER_KERNELS_MAX_VERSION = (
'3.0.0b8' if not running_under_pytest() else '4.0.0'
'3.0.0b9' if not running_under_pytest() else '4.0.0'
)
SPYDER_KERNELS_VERSION = (
f'>={SPYDER_KERNELS_MIN_VERSION},<{SPYDER_KERNELS_MAX_VERSION}'
Expand Down