123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170 |
- diff --git a/requirements/main.yml b/requirements/main.yml
- index 8245e7d..64f3fd6 100644
- --- a/requirements/main.yml
- +++ b/requirements/main.yml
- @@ -27,7 +27,6 @@ dependencies:
- - pylint-venv >=2.1.1
- - pyls-spyder >=0.4.0
- - pyqt <5.16
- - - pyqtwebengine <5.16
- - python-lsp-black >=1.2.0
- - python-lsp-server >=1.7.1,<1.8.0
- - pyzmq >=22.1.0
- diff --git a/runtests.py b/runtests.py
- index 8e94c09..38a5165 100644
- --- a/runtests.py
- +++ b/runtests.py
- @@ -20,7 +20,6 @@ os.environ['SPYDER_PYTEST'] = 'True'
- # NOTE: This needs to be imported before any QApplication.
- # Don't remove it or change it to a different location!
- # pylint: disable=wrong-import-position
- -from qtpy import QtWebEngineWidgets # noqa
- import pytest
-
-
- diff --git a/setup.py b/setup.py
- index 766d5fa..1968863 100644
- --- a/setup.py
- +++ b/setup.py
- @@ -228,7 +228,7 @@ install_requires = [
- 'python-lsp-black>=1.2.0',
- 'pyls-spyder>=0.4.0',
- 'pyqt5<5.16',
- - 'pyqtwebengine<5.16',
- +
- 'python-lsp-server[all]>=1.7.1,<1.8.0',
- 'pyxdg>=0.26;platform_system=="Linux"',
- 'pyzmq>=22.1.0',
- diff --git a/spyder/app/cli_options.py b/spyder/app/cli_options.py
- index 3ae36f0..325d99e 100644
- --- a/spyder/app/cli_options.py
- +++ b/spyder/app/cli_options.py
- @@ -139,7 +139,7 @@ def get_options(argv=None):
- '--no-web-widgets',
- dest="no_web_widgets",
- action='store_true',
- - default=False,
- + default=True,
- help="Disable the usage of web widgets in Spyder (e.g. the Help and "
- "Online help panes)."
- )
- diff --git a/spyder/app/mainwindow.py b/spyder/app/mainwindow.py
- index 0e0ab3e..cb8fb5c 100644
- --- a/spyder/app/mainwindow.py
- +++ b/spyder/app/mainwindow.py
- @@ -52,9 +52,6 @@ from qtpy.QtWidgets import (QApplication, QMainWindow, QMenu, QMessageBox,
- # Avoid a "Cannot mix incompatible Qt library" error on Windows platforms
- from qtpy import QtSvg # analysis:ignore
-
- -# Avoid a bug in Qt: https://bugreports.qt.io/browse/QTBUG-46720
- -from qtpy import QtWebEngineWidgets # analysis:ignore
- -
- from qtawesome.iconic_font import FontError
-
- #==============================================================================
- diff --git a/spyder/app/tests/conftest.py b/spyder/app/tests/conftest.py
- index eed1a5f..f8e5848 100755
- --- a/spyder/app/tests/conftest.py
- +++ b/spyder/app/tests/conftest.py
- @@ -18,7 +18,6 @@ from qtpy.QtCore import Qt
- from qtpy.QtTest import QTest
- from qtpy.QtWidgets import QApplication, QFileDialog, QLineEdit, QTabBar
- # This is required to run our tests in VSCode or Spyder-unittest
- -from qtpy import QtWebEngineWidgets # noqa
- import psutil
- import pytest
-
- diff --git a/spyder/app/tests/test_mainwindow.py b/spyder/app/tests/test_mainwindow.py
- index 94c5577..75790e9 100644
- --- a/spyder/app/tests/test_mainwindow.py
- +++ b/spyder/app/tests/test_mainwindow.py
- @@ -38,7 +38,7 @@ from qtpy import PYQT_VERSION, PYQT5
- from qtpy.QtCore import Qt, QTimer
- from qtpy.QtGui import QImage, QTextCursor
- from qtpy.QtWidgets import QAction, QApplication, QInputDialog, QWidget
- -from qtpy.QtWebEngineWidgets import WEBENGINE
- +WEBENGINE = False
-
- # Local imports
- from spyder import __trouble_url__
- diff --git a/spyder/plugins/help/tests/test_plugin.py b/spyder/plugins/help/tests/test_plugin.py
- index dfdc35b..6f30a84 100644
- --- a/spyder/plugins/help/tests/test_plugin.py
- +++ b/spyder/plugins/help/tests/test_plugin.py
- @@ -16,7 +16,7 @@ from unittest.mock import Mock, MagicMock
- # Third party imports
- from qtpy import PYQT_VERSION
- from qtpy.QtWidgets import QMainWindow
- -from qtpy.QtWebEngineWidgets import WEBENGINE
- +WEBENGINE = False
- import pytest
- from flaky import flaky
-
- diff --git a/spyder/plugins/help/widgets.py b/spyder/plugins/help/widgets.py
- index d5f5151..3400794 100644
- --- a/spyder/plugins/help/widgets.py
- +++ b/spyder/plugins/help/widgets.py
- @@ -17,7 +17,7 @@ import sys
- from qtpy import PYQT5
- from qtpy.QtCore import Qt, QUrl, Signal, Slot, QPoint
- from qtpy.QtGui import QColor
- -from qtpy.QtWebEngineWidgets import WEBENGINE, QWebEnginePage
- +
- from qtpy.QtWidgets import (QActionGroup, QComboBox, QLabel, QLineEdit,
- QMessageBox, QSizePolicy, QStackedLayout,
- QVBoxLayout, QWidget)
- diff --git a/spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py b/spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py
- index 378ac9a..8be557b 100644
- --- a/spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py
- +++ b/spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py
- @@ -28,7 +28,7 @@ from packaging.version import parse
- import pytest
- from qtpy import PYQT5
- from qtpy.QtCore import Qt
- -from qtpy.QtWebEngineWidgets import WEBENGINE
- +WEBENGINE = False
- from qtpy.QtWidgets import QMessageBox
- from spyder_kernels import __version__ as spyder_kernels_version
- import sympy
- diff --git a/spyder/plugins/ipythonconsole/widgets/main_widget.py b/spyder/plugins/ipythonconsole/widgets/main_widget.py
- index a12c77a..2130017 100644
- --- a/spyder/plugins/ipythonconsole/widgets/main_widget.py
- +++ b/spyder/plugins/ipythonconsole/widgets/main_widget.py
- @@ -23,7 +23,7 @@ import qstylizer.style
- from qtconsole.client import QtKernelClient
- from qtpy.QtCore import Signal, Slot
- from qtpy.QtGui import QColor
- -from qtpy.QtWebEngineWidgets import WEBENGINE
- +WEBENGINE = False
- from qtpy.QtWidgets import (
- QApplication, QHBoxLayout, QLabel, QMessageBox, QVBoxLayout, QWidget)
- from traitlets.config.loader import Config, load_pyconfig_files
- diff --git a/spyder/plugins/onlinehelp/widgets.py b/spyder/plugins/onlinehelp/widgets.py
- index d97a9bb..e2896ad 100644
- --- a/spyder/plugins/onlinehelp/widgets.py
- +++ b/spyder/plugins/onlinehelp/widgets.py
- @@ -16,7 +16,7 @@ import sys
- # Third party imports
- from qtpy.QtCore import Qt, QThread, QUrl, Signal, Slot
- from qtpy.QtGui import QCursor
- -from qtpy.QtWebEngineWidgets import WEBENGINE
- +WEBENGINE = False
- from qtpy.QtWidgets import QApplication, QLabel, QVBoxLayout
-
- # Local imports
- diff --git a/spyder/widgets/browser.py b/spyder/widgets/browser.py
- index fd85fcc..33b5d83 100644
- --- a/spyder/widgets/browser.py
- +++ b/spyder/widgets/browser.py
- @@ -16,8 +16,8 @@ import qstylizer.style
- from qtpy import PYQT5
- from qtpy.QtCore import QEvent, Qt, QUrl, Signal, Slot
- from qtpy.QtGui import QFontInfo
- -from qtpy.QtWebEngineWidgets import (WEBENGINE, QWebEnginePage,
- - QWebEngineSettings, QWebEngineView)
- +
- +
- from qtpy.QtWidgets import QFrame, QHBoxLayout, QLabel, QProgressBar, QWidget
-
- # Local imports
|