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.

Sign up for GitHub

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

Jump to bottom

PR: Unify kernel configuration #21903

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

PR: Unify kernel configuration #21903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29b95d7
env vars
Mar 16, 2024
a5f1a7c
git subrepo clone --branch=envvar --force https://github.com/impact27…
Mar 17, 2024
7edbff5
rename return value
Mar 17, 2024
760accf
add set_
Mar 17, 2024
b9dee74
git subrepo clone --branch=envvar --force https://github.com/impact27…
Mar 17, 2024
c877535
Merge remote-tracking branch 'upstream/master' into moveenvvars
Mar 17, 2024
0744177
git subrepo clone --branch=envvar --force https://github.com/impact27…
Mar 17, 2024
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: 3 additions & 3 deletions external-deps/spyder-kernels/.gitrepo
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions external-deps/spyder-kernels/spyder_kernels/comms/decorators.py
View file
Open in desktop

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

165 changes: 87 additions & 78 deletions external-deps/spyder-kernels/spyder_kernels/console/kernel.py
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion external-deps/spyder-kernels/spyder_kernels/console/shell.py
View file
Open in desktop

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

13 changes: 0 additions & 13 deletions external-deps/spyder-kernels/spyder_kernels/console/start.py
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions spyder/plugins/ipythonconsole/utils/kernelspec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,6 @@ def env(self):
'SPY_UMR_VERBOSE': self.get_conf(
'umr/verbose', section='main_interpreter'),
'SPY_UMR_NAMELIST': ','.join(umr_namelist),
'SPY_AUTOCALL_O': self.get_conf('autocall'),
'SPY_GREEDY_O': self.get_conf('greedy_completer'),
'SPY_JEDI_O': self.get_conf('jedi_completer'),
'SPY_TESTING': running_under_pytest() or get_safe_mode(),
'SPY_HIDE_CMD': self.get_conf('hide_cmd_windows'),
'SPY_PYTHONPATH': pypath,
Expand Down
11 changes: 10 additions & 1 deletion spyder/plugins/ipythonconsole/widgets/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,15 @@ def send_spyder_kernel_configuration(self):
# Set current cwd
self.set_cwd()

# Set autocall
self.set_autocall(self.get_conf('autocall'))

# Set greedy completer
self.set_greedy_completer(self.get_conf('greedy_completer'))

# Set Jedi Completer
self.set_jedi_completer(self.get_conf('jedi_completer'))

# To apply style
self.set_color_scheme(self.syntax_style, reset=False)

Expand Down Expand Up @@ -454,7 +463,7 @@ def kernel_configure_callback(self, dic):
for key, value in dic.items():
if key == "faulthandler":
self.kernel_handler.faulthandler_setup(value)
elif key == "special_kernel_error":
elif key == "special_kernel":
self.ipyclient._show_special_console_error(value)

def pop_execute_queue(self):
Expand Down