Merge from 5.x: PR #20271

Fixes #18117

.github/scripts/install.sh

@@ -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
@@ -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

binder/environment.yml

@@ -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

requirements/main.yml

@@ -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

setup.py

@@ -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',

spyder/dependencies.py

@@ -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'

spyder/plugins/pythonpath/widgets/pathmanager.py

@@ -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)