Skip to content

Commit

Permalink
Merge pull request #20271 from ccordoba12/ipython-8
Browse files Browse the repository at this point in the history
PR: Add support for IPython 8
  • Loading branch information
ccordoba12 authored Dec 29, 2022
2 parents 9434669 + e7a1926 commit 9b0b7ce
Show file tree
Hide file tree
Showing 18 changed files with 104 additions and 37 deletions.
6 changes: 6 additions & 0 deletions .github/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ if [ "$USE_CONDA" = "true" ]; then

# To check our manifest and coverage
mamba install check-manifest codecov -c conda-forge -q -y

# Install IPython 8
mamba install -c conda-forge ipython=8
else
# Update pip and setuptools
python -m pip install -U pip setuptools wheel build
Expand All @@ -52,6 +55,9 @@ else
pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y
pip install pyqt5==5.12.* pyqtwebengine==5.12.*
fi

# Install IPython 8
pip install ipython==8.7.0
fi

# Install subrepos from source
Expand Down
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- cookiecutter >=1.6.0
- diff-match-patch >=20181111
- intervaltree >=3.0.2
- ipython >=7.31.1,<8.0.0
- ipython >=7.31.1,<9.0.0
- jedi >=0.17.2,<0.19.0
- jellyfish >=0.7
- jsonschema >=3.2.0
Expand Down

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.

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

13 changes: 8 additions & 5 deletions external-deps/spyder-kernels/.github/workflows/windows-tests.yml

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

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.

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

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 @@ -11,7 +11,7 @@ dependencies:
- cookiecutter >=1.6.0
- diff-match-patch >=20181111
- intervaltree >=3.0.2
- ipython >=7.31.1,<8.0.0
- ipython >=7.31.1,<9.0.0
- jedi >=0.17.2,<0.19.0
- jellyfish >=0.7
- jsonschema >=3.2.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def run(self):
'cookiecutter>=1.6.0',
'diff-match-patch>=20181111',
'intervaltree>=3.0.2',
'ipython>=7.31.1,<8.0.0',
'ipython>=7.31.1,<9.0.0',
'jedi>=0.17.2,<0.19.0',
'jellyfish>=0.7',
'jsonschema>=3.2.0',
Expand Down
2 changes: 1 addition & 1 deletion spyder/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# None for pynsist install for now
# (check way to add dist.info/egg.info from packages without wheels available)
INTERVALTREE_REQVER = None if is_pynsist() else '>=3.0.2'
IPYTHON_REQVER = ">=7.31.1;<8.0.0"
IPYTHON_REQVER = ">=7.31.1;<9.0.0"
JEDI_REQVER = '>=0.17.2;<0.19.0'
JELLYFISH_REQVER = '>=0.7'
JSONSCHEMA_REQVER = '>=3.2.0'
Expand Down
2 changes: 1 addition & 1 deletion spyder/plugins/pythonpath/widgets/pathmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ def _update_system_path(self):
Request to update path values on main window if current and previous
system paths are different.
"""
if self.system_path != self.get_conf('system_path'):
if self.system_path != self.get_conf('system_path', default=()):
self.sig_path_changed.emit(self.get_path_dict())
self.set_conf('system_path', self.system_path)

Expand Down

0 comments on commit 9b0b7ce

Please sign in to comment.