Skip to content

Commit

Permalink
Merge pull request #22083 from dalthviz/update-core-deps-600b1
Browse files Browse the repository at this point in the history
PR: Update core dependencies for 6.0.0 beta1
  • Loading branch information
dalthviz authored May 15, 2024
2 parents bee5542 + c07a92a commit e7a0719
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 16 deletions.
4 changes: 2 additions & 2 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
# Please *DO NOT* make changes directly just to here - make changes
# to requirements/main.yml, and copy it here.
- aiohttp >=3.9.3
- asyncssh >=2.0.0
- asyncssh >=2.0.0,<3.0.0
- atomicwrites >=1.2.0
- chardet >=2.0.0
- cloudpickle >=0.5.0
Expand Down Expand Up @@ -48,7 +48,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=3.0.0b5,<3.0.0b6
- spyder-kernels >=3.0.0b6,<3.0.0b7
- 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.

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

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

4 changes: 2 additions & 2 deletions requirements/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channels:
- conda-forge
dependencies:
- aiohttp >=3.9.3
- asyncssh >=2.0.0
- asyncssh >=2.0.0,<3.0.0
- atomicwrites >=1.2.0
- chardet >=2.0.0
- cloudpickle >=0.5.0
Expand Down Expand Up @@ -44,7 +44,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=3.0.0b5,<3.0.0b6
- spyder-kernels >=3.0.0b6,<3.0.0b7
- superqt >=0.6.1,<1.0.0
- textdistance >=4.2.0
- three-merge >=0.1.1
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def run(self):
install_requires = [
'aiohttp>=3.9.3',
'applaunchservices>=0.3.0;platform_system=="Darwin"',
'asyncssh>=2.0.0',
'asyncssh>=2.0.0,<3.0.0',
'atomicwrites>=1.2.0',
'chardet>=2.0.0',
'cloudpickle>=0.5.0',
Expand Down Expand Up @@ -245,7 +245,7 @@ def run(self):
'rtree>=0.9.7',
'setuptools>=49.6.0',
'sphinx>=0.6.6',
'spyder-kernels>=3.0.0b5,<3.0.0b6',
'spyder-kernels>=3.0.0b6,<3.0.0b7',
'superqt>=0.6.1,<1.0.0',
'textdistance>=4.2.0',
'three-merge>=0.1.1',
Expand All @@ -260,7 +260,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.0b5,<3.1.0')
install_requires.append('spyder-kernels>=3.0.0b6,<3.1.0')

extras_require = {
'test:platform_system == "Windows"': ['pywin32'],
Expand Down
4 changes: 2 additions & 2 deletions spyder/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# Hard dependencies
AIOHTTP_REQVER = '>=3.9.3'
APPLAUNCHSERVICES_REQVER = '>=0.3.0'
ASYNCSSH_REQVER = '>=2.0.0'
ASYNCSSH_REQVER = '>=2.0.0,<3.0.0'
ATOMICWRITES_REQVER = '>=1.2.0'
CHARDET_REQVER = '>=2.0.0'
CLOUDPICKLE_REQVER = '>=0.5.0'
Expand Down Expand Up @@ -72,7 +72,7 @@
RTREE_REQVER = '>=0.9.7'
SETUPTOOLS_REQVER = '>=49.6.0'
SPHINX_REQVER = '>=0.6.6'
SPYDER_KERNELS_REQVER = '>=3.0.0b5,<3.0.0b6'
SPYDER_KERNELS_REQVER = '>=3.0.0b6,<3.0.0b7'
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,10 +20,10 @@

# Required version of Spyder-kernels
SPYDER_KERNELS_MIN_VERSION = (
'3.0.0b5' if not running_under_pytest() else '3.0.0.dev0'
'3.0.0b6' if not running_under_pytest() else '3.0.0.dev0'
)
SPYDER_KERNELS_MAX_VERSION = (
'3.0.0b6' if not running_under_pytest() else '4.0.0'
'3.0.0b7' 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 e7a0719

Please sign in to comment.