Skip to content

Commit c6b8fea

Browse files
committed
Merge from 5.x: PR #20274
2 parents 0b549f0 + f17a848 commit c6b8fea

File tree

10 files changed

+66
-26
lines changed

10 files changed

+66
-26
lines changed

external-deps/python-lsp-server/.gitrepo

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/python-lsp-server/CONFIGURATION.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/python-lsp-server/pylsp/config/schema.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/python-lsp-server/pylsp/plugins/definition.py

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/python-lsp-server/pylsp/plugins/hover.py

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/python-lsp-server/pylsp/plugins/pylint_lint.py

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/python-lsp-server/pylsp/plugins/symbols.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/python-lsp-server/test/plugins/test_definitions.py

Lines changed: 17 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external-deps/python-lsp-server/test/plugins/test_pylint_lint.py

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spyder/config/lsp.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,13 @@
7777
},
7878
'jedi': {
7979
'environment': None,
80-
'extra_paths': None,
80+
'extra_paths': [],
8181
'env_vars': None,
82+
# Until we have a graphical way for users to add modules to
83+
# this option
84+
'auto_import_modules': [
85+
'numpy', 'matplotlib', 'pandas', 'scipy'
86+
]
8287
},
8388
'jedi_completion': {
8489
'enabled': True,
@@ -128,6 +133,12 @@
128133
'group_cells': True
129134
},
130135
'pyls_flake8': {
136+
# This third-party plugin is deprecated now.
137+
'enabled': False,
138+
},
139+
'ruff': {
140+
# Disable it until we have a graphical option for users to
141+
# enable it.
131142
'enabled': False,
132143
}
133144
},

0 commit comments

Comments
 (0)