Skip to content
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
6 changes: 6 additions & 0 deletions .github/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ if [ "$USE_CONDA" = "true" ]; then
# Remove pylsp before installing its subrepo below
micromamba remove --force python-lsp-server python-lsp-server-base -y

# Install Pylint 3 to run our tests with it
micromamba install pylint=3 -q -y
Copy link
Member

Choose a reason for hiding this comment

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

Remove these lines when PyLSP 1.9 is released.


else
# Update pip and setuptools
python -m pip install -U pip setuptools wheel build
Expand All @@ -42,6 +45,9 @@ else
# To check our manifest
pip install -q check-manifest

# Install Pylint 3 to run our tests with it
pip install -U pylint
Comment on lines +48 to +49
Copy link
Member

Choose a reason for hiding this comment

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

And these lines too.


# 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
Expand Down
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- pickleshare >=0.4
- psutil >=5.3
- pygments >=2.0
- pylint >=2.5.0,<3.0
- pylint >=2.5.0,<3.1
- pylint-venv >=3.0.2
- pyls-spyder >=0.4.0
- pyqt <5.16
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.

40 changes: 40 additions & 0 deletions external-deps/python-lsp-server/CHANGELOG.md

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

5 changes: 4 additions & 1 deletion external-deps/python-lsp-server/CONFIGURATION.md

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

1 change: 1 addition & 0 deletions external-deps/python-lsp-server/docs/autoimport.md

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

1 change: 0 additions & 1 deletion 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.

4 changes: 4 additions & 0 deletions 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.

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

Loading