diff --git a/MAINTENANCE.md b/MAINTENANCE.md index c0fdfa974bd..79ab911a70d 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -29,7 +29,7 @@ These are some instructions meant for maintainers of this repo. * If a PR in spyder-kernels solves an issue in Spyder but was not part of a PR that updated its subrepo, you need to open one that does precisely that, i.e. update its subrepo, in order to fix that issue. - The same goes for the python-lsp-server subrepo. + The same goes for the python-lsp-server and qtconsole subrepos. * There's a bot that constantly monitors all issues in order to close duplicates or already solved issues and inform users what they can do about them (basically wait to be fixed or update). diff --git a/RELEASE.md b/RELEASE.md index ba6c2c98cb7..b1248ceaa32 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -107,7 +107,7 @@ To release a new version of Spyder you need to follow these steps: * Update the version of any packages required before the release in the following files: - - `setup.py` + - `setup.py` (look up for the Windows installer patch too) - `spyder/dependencies.py` - `requirements/conda.txt` - `binder/environment.yml` diff --git a/binder/environment.yml b/binder/environment.yml index 63d1bfbc01e..00405f3a038 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -29,19 +29,19 @@ dependencies: - pylint >=2.5.0 - pyls-spyder >=0.4.0 - pyqt <5.16 -- python-lsp-black >=1.0.0 -- python-lsp-server >=1.4.0,<1.5.0 +- python-lsp-black >=1.2.0 +- python-lsp-server >=1.4.1,<1.5.0 - pyxdg >=0.26 - pyzmq >=17 - qdarkstyle >=3.0.2,<3.1.0 - qstylizer >=0.1.10 - qtawesome >=1.0.2 -- qtconsole >=5.2.1,<5.3.0 +- qtconsole >=5.3.0,<5.4.0 - qtpy >=2.0.1 - rtree >=0.9.7 - setuptools >=49.6.0 - sphinx >=0.6.6 -- spyder-kernels >=2.2.1,<2.3.0 +- spyder-kernels >=2.3.0,<2.4.0 - textdistance >=4.2.0 - three-merge >=0.1.1 - watchdog >=0.10.3 diff --git a/external-deps/python-lsp-server/.gitrepo b/external-deps/python-lsp-server/.gitrepo index ab5a9b18c59..568cae68ef6 100644 --- a/external-deps/python-lsp-server/.gitrepo +++ b/external-deps/python-lsp-server/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/python-lsp/python-lsp-server.git branch = develop - commit = 62cdac5989142744d2fee56ec4acbf77f61bf942 - parent = 9a992d4e68a954590fb88ab69ca11d4f55d6d53a + commit = c99ef24d790b8fb81b5419f69270b7f014a50d30 + parent = 985458f36341268b7c301929d6aed127599093db method = merge cmdver = 0.4.3 diff --git a/external-deps/python-lsp-server/README.md b/external-deps/python-lsp-server/README.md index cb31bf98b6a..16948e56209 100644 --- a/external-deps/python-lsp-server/README.md +++ b/external-deps/python-lsp-server/README.md @@ -12,6 +12,7 @@ The base language server requires [Jedi](https://github.com/davidhalter/jedi) to ``` pip install python-lsp-server ``` +This will expose the command `pylsp` on your PATH. Confirm that installation succeeded by running `pylsp --help`. If the respective dependencies are found, the following optional providers will be enabled: - [Rope](https://github.com/python-rope/rope) for Completions and renaming diff --git a/external-deps/qtconsole/.gitrepo b/external-deps/qtconsole/.gitrepo index fe8a6c0f338..6b702b27d0b 100644 --- a/external-deps/qtconsole/.gitrepo +++ b/external-deps/qtconsole/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/jupyter/qtconsole.git branch = master - commit = bcab5aaf829043967af01b04161d98a9da411483 - parent = 6f027a6745613db4a351c91f17a3d2cfdfcb90e1 + commit = 3d29df8adc23ab8ab6c20b870c369806339ee342 + parent = ba96ec79f4a35e749bd9f6d331898dc2f1748a53 method = merge cmdver = 0.4.3 diff --git a/external-deps/qtconsole/docs/source/changelog.rst b/external-deps/qtconsole/docs/source/changelog.rst index b043b397360..078ff3ad952 100644 --- a/external-deps/qtconsole/docs/source/changelog.rst +++ b/external-deps/qtconsole/docs/source/changelog.rst @@ -3,6 +3,28 @@ Changes in Jupyter Qt console ============================= +.. _5.3: + +5.3 +~~~ + +5.3.0 +----- + +`5.3.0 on GitHub `__ + +Additions ++++++++++ + +* Add support for PyQt6. + +Changes ++++++++ + +* Don't show spurious blank lines when running input statements. +* Fix showing Latex images with dark background colors. +* Drop support for Python 3.6 + .. _5.2: 5.2 diff --git a/external-deps/qtconsole/qtconsole/_version.py b/external-deps/qtconsole/qtconsole/_version.py index bba50134d5b..1dbdda705db 100644 --- a/external-deps/qtconsole/qtconsole/_version.py +++ b/external-deps/qtconsole/qtconsole/_version.py @@ -1,2 +1,2 @@ -version_info = (5, 3, 0, 'dev0') +version_info = (5, 4, 0, 'dev0') __version__ = '.'.join(map(str, version_info)) diff --git a/installers/Windows/req-extras-pull-request.txt b/installers/Windows/req-extras-pull-request.txt index 3cc07fec1d1..976a5ec63e2 100644 --- a/installers/Windows/req-extras-pull-request.txt +++ b/installers/Windows/req-extras-pull-request.txt @@ -18,7 +18,7 @@ cython sympy # Spyder external plugins -spyder-terminal>=1.2.1 +spyder-terminal>=1.2.2 # Spyder external dependencies (spyder-kernels and qdarkstyle) ./external-deps/spyder-kernels diff --git a/installers/Windows/req-extras-release.txt b/installers/Windows/req-extras-release.txt index 7ed3847979a..b9eb1938ec7 100644 --- a/installers/Windows/req-extras-release.txt +++ b/installers/Windows/req-extras-release.txt @@ -18,4 +18,4 @@ cython sympy # Spyder external plugins -spyder-terminal>=1.2.1 +spyder-terminal>=1.2.2 diff --git a/installers/Windows/req-pull-request.txt b/installers/Windows/req-pull-request.txt index 3c37e9dbec2..861f2e8f9cf 100644 --- a/installers/Windows/req-pull-request.txt +++ b/installers/Windows/req-pull-request.txt @@ -1,5 +1,5 @@ # Spyder external plugins -spyder-terminal>=1.2.1 +spyder-terminal>=1.2.2 # Spyder external dependencies (spyder-kernels and qdarkstyle) ./external-deps/spyder-kernels diff --git a/installers/Windows/req-release.txt b/installers/Windows/req-release.txt index 11f1aa588a1..040c0823c55 100644 --- a/installers/Windows/req-release.txt +++ b/installers/Windows/req-release.txt @@ -1,2 +1,2 @@ # Spyder external plugins -spyder-terminal>=1.2.1 +spyder-terminal>=1.2.2 diff --git a/installers/macOS/req-extras.txt b/installers/macOS/req-extras.txt index efa2aa42bd1..b197acc34eb 100644 --- a/installers/macOS/req-extras.txt +++ b/installers/macOS/req-extras.txt @@ -1,6 +1,5 @@ # Spyder extra packages autopep8 -black==21.12b0 # App fails with version 22 flake8 Paramiko pycodestyle diff --git a/requirements/conda.txt b/requirements/conda.txt index 259dab39d1a..44c0fbbac24 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -25,19 +25,19 @@ pygments >=2.0 pylint >=2.5.0 pyls-spyder >=0.4.0 pyqt <5.16 -python-lsp-black >=1.0.0 -python-lsp-server >=1.4.0,<1.5.0 +python-lsp-black >=1.2.0 +python-lsp-server >=1.4.1,<1.5.0 pyxdg >=0.26 pyzmq >=17 qdarkstyle >=3.0.2,<3.1.0 qstylizer >=0.1.10 qtawesome >=1.0.2 -qtconsole >=5.2.1,<5.3.0 +qtconsole >=5.3.0,<5.4.0 qtpy >=2.0.1 rtree >=0.9.7 setuptools >=49.6.0 sphinx >=0.6.6 -spyder-kernels >=2.2.1,<2.3.0 +spyder-kernels >=2.3.0,<2.4.0 textdistance >=4.2.0 three-merge >=0.1.1 watchdog >=0.10.3 diff --git a/setup.py b/setup.py index 68ff544f7e1..07df7c2cc90 100644 --- a/setup.py +++ b/setup.py @@ -224,22 +224,22 @@ def run(self): 'psutil>=5.3', 'pygments>=2.0', 'pylint>=2.5.0', - 'python-lsp-black>=1.0.0', + 'python-lsp-black>=1.2.0', 'pyls-spyder>=0.4.0', 'pyqt5<5.16', 'pyqtwebengine<5.16', - 'python-lsp-server[all]>=1.4.0,<1.5.0', + 'python-lsp-server[all]>=1.4.1,<1.5.0', 'pyxdg>=0.26;platform_system=="Linux"', 'pyzmq>=17', 'qdarkstyle>=3.0.2,<3.1.0', 'qstylizer>=0.1.10', 'qtawesome>=1.0.2', - 'qtconsole>=5.2.1,<5.3.0', + 'qtconsole>=5.3.0,<5.4.0', 'qtpy>=2.0.1', 'rtree>=0.9.7', 'setuptools>=49.6.0', 'sphinx>=0.6.6', - 'spyder-kernels>=2.2.1,<2.3.0', + 'spyder-kernels>=2.3.0,<2.4.0', 'textdistance>=4.2.0', 'three-merge>=0.1.1', 'watchdog>=0.10.3' @@ -248,8 +248,8 @@ def run(self): # Replace spyder-kernels constraint to enable # building Windows installers on PRs if 'dev' in __version__ and WINDOWS_INSTALLER_NAME: - install_requires.remove('spyder-kernels>=2.2.1,<2.3.0') - install_requires.append('spyder-kernels>=2.2.1,<=2.3.0.dev0') + install_requires.remove('spyder-kernels>=2.3.0,<2.4.0') + install_requires.append('spyder-kernels>=2.3.0,<=2.4.0.dev0') extras_require = { 'test:platform_system == "Windows"': ['pywin32'], diff --git a/spyder/dependencies.py b/spyder/dependencies.py index 9ceeb4ec210..e18953cd51f 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -53,20 +53,20 @@ PSUTIL_REQVER = '>=5.3' PYGMENTS_REQVER = '>=2.0' PYLINT_REQVER = '>=2.5.0' -PYLSP_REQVER = '>=1.4.0;<1.5.0' -PYLSP_BLACK_REQVER = '>=1.0.0' +PYLSP_REQVER = '>=1.4.1;<1.5.0' +PYLSP_BLACK_REQVER = '>=1.2.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYXDG_REQVER = '>=0.26' PYZMQ_REQVER = '>=17' QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0' QSTYLIZER_REQVER = '>=0.1.10' QTAWESOME_REQVER = '>=1.0.2' -QTCONSOLE_REQVER = '>=5.2.1;<5.3.0' +QTCONSOLE_REQVER = '>=5.3.0;<5.4.0' QTPY_REQVER = '>=2.0.1' RTREE_REQVER = '>=0.9.7' SETUPTOOLS_REQVER = '>=49.6.0' SPHINX_REQVER = '>=0.6.6' -SPYDER_KERNELS_REQVER = '>=2.2.1;<2.3.0' +SPYDER_KERNELS_REQVER = '>=2.3.0;<2.4.0' TEXTDISTANCE_REQVER = '>=4.2.0' THREE_MERGE_REQVER = '>=0.1.1' # None for pynsist install for now diff --git a/spyder/plugins/ipythonconsole/widgets/main_widget.py b/spyder/plugins/ipythonconsole/widgets/main_widget.py index 7c94a874726..7b6ae8d73a0 100644 --- a/spyder/plugins/ipythonconsole/widgets/main_widget.py +++ b/spyder/plugins/ipythonconsole/widgets/main_widget.py @@ -58,8 +58,8 @@ # ---- Constants # ============================================================================= MAIN_BG_COLOR = QStylePalette.COLOR_BACKGROUND_1 -SPYDER_KERNELS_MIN_VERSION = '2.2.1' -SPYDER_KERNELS_MAX_VERSION = '2.3.0' +SPYDER_KERNELS_MIN_VERSION = '2.3.0' +SPYDER_KERNELS_MAX_VERSION = '2.4.0' SPYDER_KERNELS_VERSION = ( f'>={SPYDER_KERNELS_MIN_VERSION};<{SPYDER_KERNELS_MAX_VERSION}') SPYDER_KERNELS_VERSION_MSG = _(