diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh index 30639e1b851..3176229dfc1 100755 --- a/.github/scripts/install.sh +++ b/.github/scripts/install.sh @@ -30,9 +30,6 @@ if [ "$USE_CONDA" = "true" ]; then # So, pinning it to 8.14 for now. micromamba install ipython=8.14 - # Install Pylint 3 to run our tests with it - micromamba install pylint=3 -q -y - else # Update pip and setuptools python -m pip install -U pip setuptools wheel build @@ -49,9 +46,6 @@ else # To check our manifest pip install -q check-manifest - # Install Pylint 3 to run our tests with it - pip install -U pylint - # This allows the test suite to run more reliably on Linux if [ "$OS" = "linux" ]; then pip uninstall pyqt5 pyqt5-qt5 pyqt5-sip pyqtwebengine pyqtwebengine-qt5 -q -y diff --git a/binder/environment.yml b/binder/environment.yml index c8414cade81..e7c8b653e3f 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -34,7 +34,7 @@ dependencies: - pyqt >=5.10,<5.16 - pyqtwebengine >=5.10,<5.16 - python-lsp-black >=1.2.0,<3.0.0 -- python-lsp-server >=1.8.0,<1.9.0 +- python-lsp-server >=1.9.0,<1.10.0 - pyuca >=1.2 - pyxdg >=0.26 - pyzmq >=22.1.0 diff --git a/external-deps/python-lsp-server/.gitrepo b/external-deps/python-lsp-server/.gitrepo index 5b601fff00b..67ba5c8062f 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 = 5f53f8e7ecacaa2e2ea91bc8707729980dffc407 - parent = c2ba41d868c05ac8c0337037966c936f3d47fcf5 + commit = 4428a656c4271580d2720df9962f4e5a5669c026 + parent = a46c49949535e42c513cc597195d8dd017d3ede2 method = merge cmdver = 0.4.3 diff --git a/external-deps/python-lsp-server/CHANGELOG.md b/external-deps/python-lsp-server/CHANGELOG.md index eb9c7957afe..8c35d251f90 100644 --- a/external-deps/python-lsp-server/CHANGELOG.md +++ b/external-deps/python-lsp-server/CHANGELOG.md @@ -1,5 +1,34 @@ # History of changes +## Version 1.9.0 (2023/11/06) + +### Issues Closed + +* [Issue 460](https://github.com/python-lsp/python-lsp-server/issues/460) - rope_autoimport doesn't initialize after `workspace/didChangeConfiguration` message ([PR 461](https://github.com/python-lsp/python-lsp-server/pull/461) by [@tkrabel-db](https://github.com/tkrabel-db)) +* [Issue 403](https://github.com/python-lsp/python-lsp-server/issues/403) - Add code action for implementing auto-import ([PR 471](https://github.com/python-lsp/python-lsp-server/pull/471) by [@tkrabel-db](https://github.com/tkrabel-db)) +* [Issue 195](https://github.com/python-lsp/python-lsp-server/issues/195) - Maybe use initializationOptions as additional source of settings ([PR 459](https://github.com/python-lsp/python-lsp-server/pull/459) by [@tkrabel-db](https://github.com/tkrabel-db)) + +In this release 3 issues were closed. + +### Pull Requests Merged + +* [PR 481](https://github.com/python-lsp/python-lsp-server/pull/481) - Revert "Rename `_utils` module to `utils`", by [@ccordoba12](https://github.com/ccordoba12) +* [PR 480](https://github.com/python-lsp/python-lsp-server/pull/480) - Rename `_utils` module to `utils`, by [@ccordoba12](https://github.com/ccordoba12) +* [PR 475](https://github.com/python-lsp/python-lsp-server/pull/475) - Raise supported Pylint upper version, by [@bnavigator](https://github.com/bnavigator) +* [PR 473](https://github.com/python-lsp/python-lsp-server/pull/473) - Improve/simplify README Development section, by [@tkrabel](https://github.com/tkrabel) +* [PR 471](https://github.com/python-lsp/python-lsp-server/pull/471) - Add code completions to `rope_autoimport` plugin, by [@tkrabel-db](https://github.com/tkrabel-db) ([403](https://github.com/python-lsp/python-lsp-server/issues/403)) +* [PR 469](https://github.com/python-lsp/python-lsp-server/pull/469) - Pass argument `extendIgnore` to flake8, by [@UnkwUsr](https://github.com/UnkwUsr) +* [PR 466](https://github.com/python-lsp/python-lsp-server/pull/466) - Ignore notebook names on cell completion for autoimport, by [@tkrabel-db](https://github.com/tkrabel-db) +* [PR 464](https://github.com/python-lsp/python-lsp-server/pull/464) - Minor bug fix in Rope autoimport plugin, by [@tkrabel-db](https://github.com/tkrabel-db) +* [PR 462](https://github.com/python-lsp/python-lsp-server/pull/462) - Make workspace/didChangeConfig work with notebook documents, by [@tkrabel-db](https://github.com/tkrabel-db) +* [PR 461](https://github.com/python-lsp/python-lsp-server/pull/461) - Load `rope_autoimport` cache on `workspace/didChangeConfiguration`, by [@tkrabel-db](https://github.com/tkrabel-db) ([460](https://github.com/python-lsp/python-lsp-server/issues/460)) +* [PR 459](https://github.com/python-lsp/python-lsp-server/pull/459) - Support `initializationOptions` to configure the server, by [@tkrabel-db](https://github.com/tkrabel-db) ([195](https://github.com/python-lsp/python-lsp-server/issues/195)) +* [PR 457](https://github.com/python-lsp/python-lsp-server/pull/457) - Fix missing signatures for docstrings in Markdown, by [@staticf0x](https://github.com/staticf0x) + +In this release 12 pull requests were closed. + +---- + ## Version 1.8.2 (2023/10/09) ### Issues Closed diff --git a/external-deps/python-lsp-server/README.md b/external-deps/python-lsp-server/README.md index 2e2c7218ab5..842cdbadd85 100644 --- a/external-deps/python-lsp-server/README.md +++ b/external-deps/python-lsp-server/README.md @@ -48,7 +48,7 @@ pip install -U setuptools If you use Anaconda/Miniconda, you can install `python-lsp-server` using this conda command ``` -conda install -c conda-forge python-lsp-server +conda install -c conda-forge python-lsp-server ``` Python-lsp-server is available in the repos of every major Linux distribution, and it is usually called `python-lsp-server` or `python3-pylsp`. @@ -164,25 +164,25 @@ pip install 'python-lsp-server[websockets]' Dev install ``` -# create conda env -conda create --name python-lsp-server python=3.8 -y +# (optional) create conda env +conda create --name python-lsp-server python=3.11 -y conda activate python-lsp-server -pip install ".[all]" -pip install ".[websockets]" +pip install -e ".[all,websockets,test]" ``` Run server with ws ``` -pylsp --ws -v # Info level logging -pylsp --ws -v -v # Debug level logging +pylsp --ws -v # Info level logging +pylsp --ws -vv # Debug level logging ``` To run the test suite: ```sh -pip install ".[test]" && pytest +# requires: pip install ".[test]" (see above) +pytest ``` After adding configuration options to `schema.json`, refresh the `CONFIGURATION.md` file with diff --git a/requirements/main.yml b/requirements/main.yml index 2ed4e713f83..80754a89bfa 100644 --- a/requirements/main.yml +++ b/requirements/main.yml @@ -31,7 +31,7 @@ dependencies: - pyqt >=5.10,<5.16 - pyqtwebengine >=5.10,<5.16 - python-lsp-black >=1.2.0,<3.0.0 - - python-lsp-server >=1.8.0,<1.9.0 + - python-lsp-server >=1.9.0,<1.10.0 - pyuca >=1.2 - pyzmq >=22.1.0 - qdarkstyle >=3.2.0,<3.3.0 diff --git a/setup.py b/setup.py index 1bdf4f9230b..cce1d3cdab5 100644 --- a/setup.py +++ b/setup.py @@ -231,7 +231,7 @@ def run(self): 'pyqt5>=5.10,<5.16', 'pyqtwebengine>=5.10,<5.16', 'python-lsp-black>=1.2.0,<3.0.0', - 'python-lsp-server[all]>=1.8.0,<1.9.0', + 'python-lsp-server[all]>=1.9.0,<1.10.0', 'pyuca>=1.2', 'pyxdg>=0.26;platform_system=="Linux"', 'pyzmq>=22.1.0', @@ -255,7 +255,7 @@ def run(self): reqs_to_loosen = {'python-lsp-server[all]', 'qtconsole', 'spyder-kernels'} install_requires = [req for req in install_requires if req.split(">")[0] not in reqs_to_loosen] - install_requires.append('python-lsp-server[all]>=1.8.0,<1.10.0') + install_requires.append('python-lsp-server[all]>=1.9.0,<1.11.0') install_requires.append('qtconsole>=5.5.0,<5.7.0') install_requires.append('spyder-kernels>=3.0.0b2,<3.1.0') diff --git a/spyder/dependencies.py b/spyder/dependencies.py index 6bbe8653a76..3403a4aa5cb 100644 --- a/spyder/dependencies.py +++ b/spyder/dependencies.py @@ -56,7 +56,7 @@ PYGMENTS_REQVER = '>=2.0' PYLINT_REQVER = '>=2.5.0,<3.1' PYLINT_VENV_REQVER = '>=3.0.2' -PYLSP_REQVER = '>=1.8.0,<1.9.0' +PYLSP_REQVER = '>=1.9.0,<1.10.0' PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0' PYLS_SPYDER_REQVER = '>=0.4.0' PYUCA_REQVER = '>=1.2'