Skip to content

Commit

Permalink
Merge pull request #19969 from ccordoba12/update-pylsp-subrepo
Browse files Browse the repository at this point in the history
PR: Some fixes to make Spyder work with the latest changes in PyLSP
  • Loading branch information
ccordoba12 authored Nov 2, 2022
2 parents ef4a41e + 90e4f8d commit 79432a3
Show file tree
Hide file tree
Showing 27 changed files with 283 additions and 128 deletions.
5 changes: 5 additions & 0 deletions .github/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ if [ "$USE_CONDA" = "true" ]; then
else
mamba install 'numpy<1.23'
fi

# Install docstring-to-markdown until we release PyLSP 1.6.0
mamba install docstring-to-markdown
else
# Update pip and setuptools
python -m pip install -U pip setuptools wheel build
Expand All @@ -63,6 +66,8 @@ else
pip install pyqt5==5.12.* pyqtwebengine==5.12.*
fi

# Install docstring-to-markdown until we release PyLSP 1.6.0
pip install docstring-to-markdown
fi

# Install subrepos from source
Expand Down
4 changes: 2 additions & 2 deletions external-deps/python-lsp-server/.gitrepo

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

21 changes: 11 additions & 10 deletions external-deps/python-lsp-server/CONFIGURATION.md

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

79 changes: 74 additions & 5 deletions external-deps/python-lsp-server/pylsp/_utils.py

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/python-lsp-server/pylsp/config/config.py

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

34 changes: 21 additions & 13 deletions external-deps/python-lsp-server/pylsp/config/schema.json

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.

29 changes: 12 additions & 17 deletions external-deps/python-lsp-server/pylsp/plugins/hover.py

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

Loading

0 comments on commit 79432a3

Please sign in to comment.