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.

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

PR: Update dependencies for 5.0.2 #15487

Merged
merged 2 commits into from
May 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies:
- qdarkstyle =3.0.2
- qstylizer >=0.1.10
- qtawesome >=1.0.2
- qtconsole >=5.0.3
- qtconsole >=5.1.0
- qtpy >=1.5.0
- rtree >=0.8.3
- setuptools >=39.0.0
Expand Down
4 changes: 2 additions & 2 deletions external-deps/spyder-kernels/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/spyder-ide/spyder-kernels.git
branch = 2.x
commit = f15f5ee85c0e926bcba23aad70b64d13e4c4b3f5
parent = 3e8408ee42bd5bbeca61b8c1414f3301ff946455
commit = 0a43f16a52aa96a5a2a989a8fc12a59ea4a8e1dd
parent = 98433953e049c134175319196ec4d26580002a18
method = merge
cmdver = 0.4.3
14 changes: 14 additions & 0 deletions external-deps/spyder-kernels/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# History of changes

## Version 2.0.2 (2021-05-02)

### Pull Requests Merged

* [PR 289](https://github.com/spyder-ide/spyder-kernels/pull/289) - PR: Fix setting tight layout in inline figures, by [@ccordoba12](https://github.com/ccordoba12)
* [PR 287](https://github.com/spyder-ide/spyder-kernels/pull/287) - PR: Close comm on shutdown, by [@impact27](https://github.com/impact27)
* [PR 282](https://github.com/spyder-ide/spyder-kernels/pull/282) - PR: Fix numpy.complex deprecation warning in tests, by [@ArchangeGabriel](https://github.com/ArchangeGabriel)

In this release 3 pull requests were closed.


----


## Version 2.0.1 (2021-04-02)

* This release also contains all fixes present in version 1.10.3
Expand Down
11 changes: 10 additions & 1 deletion external-deps/spyder-kernels/spyder_kernels/console/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import ipykernel
from ipykernel.ipkernel import IPythonKernel
from ipykernel.zmqshell import ZMQInteractiveShell
from traitlets.config.loader import LazyConfigValue

# Local imports
from spyder_kernels.py3compat import TEXT_TYPES, to_text_string
Expand Down Expand Up @@ -456,7 +457,7 @@ def set_mpl_inline_bbox_inches(self, bbox_inches):
"""
Set inline print figure bbox inches.

The change is done by updating the ´rint_figure_kwargs' config dict.
The change is done by updating the 'print_figure_kwargs' config dict.
"""
from IPython.core.getipython import get_ipython
config = get_ipython().kernel.config
Expand All @@ -468,6 +469,14 @@ def set_mpl_inline_bbox_inches(self, bbox_inches):
bbox_inches_dict = {
'bbox_inches': 'tight' if bbox_inches else None}
print_figure_kwargs.update(bbox_inches_dict)

# This seems to be necessary for newer versions of Traitlets because
# print_figure_kwargs doesn't return a dict.
if isinstance(print_figure_kwargs, LazyConfigValue):
figure_kwargs_dict = print_figure_kwargs.to_dict().get('update')
if figure_kwargs_dict:
print_figure_kwargs = figure_kwargs_dict

self._set_config_option(
'InlineBackend.print_figure_kwargs', print_figure_kwargs)

Expand Down
2 changes: 1 addition & 1 deletion requirements/conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pyzmq >=17
qdarkstyle =3.0.2
qstylizer >=0.1.10
qtawesome >=1.0.2
qtconsole >=5.0.3
qtconsole >=5.1.0
qtpy >=1.5.0
rtree >=0.8.3
setuptools >=39.0.0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@ def run(self):
'qdarkstyle==3.0.2',
'qstylizer>=0.1.10',
'qtawesome>=1.0.2',
'qtconsole>=5.0.3',
'qtconsole>=5.1.0',
'qtpy>=1.5.0',
'setuptools>=39.0.0',
'sphinx>=0.6.6',
'spyder-kernels>=2.0.1,<2.1.0',
'spyder-kernels>=2.0.2,<2.1.0',
'textdistance>=4.2.0',
'three-merge>=0.1.1',
'watchdog>=0.10.3,<2.0.0'
Expand Down
4 changes: 2 additions & 2 deletions spyder/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
QDARKSTYLE_REQVER = '=3.0.2'
QSTYLIZER_REQVER = '>=0.1.10'
QTAWESOME_REQVER = '>=1.0.2'
QTCONSOLE_REQVER = '>=5.0.3'
QTCONSOLE_REQVER = '>=5.1.0'
QTPY_REQVER = '>=1.5.0'
RTREE_REQVER = '>=0.8.3'
SETUPTOOLS_REQVER = '>=39.0.0'
SPHINX_REQVER = '>=0.6.6'
SPYDER_KERNELS_REQVER = '>=2.0.1;<2.1.0'
SPYDER_KERNELS_REQVER = '>=2.0.2;<2.1.0'
TEXTDISTANCE_REQVER = '>=4.2.0'
THREE_MERGE_REQVER = '>=0.1.1'
# None for pynsist install for now
Expand Down