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

if [ "$OS" = "linux" ]; then
# Pin Jedi to 0.19.1 because test_update_outline fails frequently with
# 0.19.2, although it passes locally
micromamba install jedi=0.19.1
elif [ "$OS" = "win" ]; then
# Force installation of Jedi 0.20
micromamba install jedi=0.20

if [ "$OS" = "win" ]; then
# Build 8 of this version makes tests fail in odd ways.
micromamba install bzip2=1.0.8=h2466b09_7
fi
Expand All @@ -78,11 +77,8 @@ else
# Pin IPykernel to 7.2.0 because version 7.3.0+ causes segfaults
pip install ipykernel==7.2.0

# Pin Jedi to 0.19.1 because test_update_outline fails frequently with
# 0.19.2, although it passes locally
if [ "$OS" = "linux" ]; then
pip install jedi==0.19.1
fi
# Force installation of Jedi 0.20
pip install jedi==0.20.0
fi

# Install subrepos from source
Expand Down
2 changes: 1 addition & 1 deletion binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- intervaltree >=3.0.2
- ipython >=9.15.0,<10.0.0
- ipython_pygments_lexers >=1.0
- jedi >=0.17.2,<0.20.0
- jedi >=0.17.2,<0.21.0
- jellyfish >=0.7
- jsonschema >=3.2.0
- keyring >=17.0.0
Expand Down
6 changes: 3 additions & 3 deletions external-deps/python-lsp-server/.github/workflows/static.yml

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.

10 changes: 5 additions & 5 deletions external-deps/python-lsp-server/.github/workflows/test-mac.yml

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.

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.

2 changes: 1 addition & 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.

2 changes: 1 addition & 1 deletion external-deps/python-lsp-server/README.md

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

29 changes: 28 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.

7 changes: 5 additions & 2 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.

5 changes: 4 additions & 1 deletion external-deps/python-lsp-server/pylsp/plugins/definition.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.

2 changes: 1 addition & 1 deletion external-deps/python-lsp-server/pyproject.toml

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

91 changes: 91 additions & 0 deletions external-deps/python-lsp-server/test/plugins/test_autoimport.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
Loading