Skip to content

Commit

Permalink
Merge pull request #18655 from dalthviz/update-core-deps-532
Browse files Browse the repository at this point in the history
PR: Update core dependencies for 5.3.2
  • Loading branch information
dalthviz committed Jul 13, 2022
2 parents 59e505a + c944b20 commit 70ab396
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 14 deletions.
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=2.3.1,<2.4.0
- spyder-kernels >=2.3.2,<2.4.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.

25 changes: 25 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 external-deps/spyder-kernels/requirements/posix.txt

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

2 changes: 1 addition & 1 deletion external-deps/spyder-kernels/requirements/windows.txt

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

2 changes: 1 addition & 1 deletion external-deps/spyder-kernels/setup.py

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.

2 changes: 1 addition & 1 deletion requirements/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies:
- rtree >=0.9.7
- setuptools >=49.6.0
- sphinx >=0.6.6
- spyder-kernels >=2.3.1,<2.4.0
- spyder-kernels >=2.3.2,<2.4.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 @@ -239,7 +239,7 @@ def run(self):
'rtree>=0.9.7',
'setuptools>=49.6.0',
'sphinx>=0.6.6',
'spyder-kernels>=2.3.1,<2.4.0',
'spyder-kernels>=2.3.2,<2.4.0',
'textdistance>=4.2.0',
'three-merge>=0.1.1',
'watchdog>=0.10.3'
Expand All @@ -252,7 +252,7 @@ def run(self):
if req.split(">")[0] not in reqs_to_loosen]
install_requires.append('python-lsp-server[all]>=1.5.0,<1.7.0')
install_requires.append('qtconsole>=5.3.0,<5.5.0')
install_requires.append('spyder-kernels>=2.3.1,<2.5.0')
install_requires.append('spyder-kernels>=2.3.2,<2.5.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 @@ -65,7 +65,7 @@
RTREE_REQVER = '>=0.9.7'
SETUPTOOLS_REQVER = '>=49.6.0'
SPHINX_REQVER = '>=0.6.6'
SPYDER_KERNELS_REQVER = '>=2.3.1;<2.4.0'
SPYDER_KERNELS_REQVER = '>=2.3.2;<2.4.0'
TEXTDISTANCE_REQVER = '>=4.2.0'
THREE_MERGE_REQVER = '>=0.1.1'
# None for pynsist install for now
Expand Down

0 comments on commit 70ab396

Please sign in to comment.