Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Some fixes to make Spyder work with the latest changes in PyLSP #19969

Merged
merged 6 commits into from
Nov 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Comment on lines +42 to +43
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dalthviz, this needs to be removed when updating our dependencies before releasing 5.4.0.

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
Comment on lines +69 to +70
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this.

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