Skip to content

Change IPython kernel to Jupyter kernel #14375

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

Merged
merged 1 commit into from
Oct 12, 2020
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
4 changes: 2 additions & 2 deletions .github/test_plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -520,9 +520,9 @@ def test_failure():
1. Use `X` to delete all cells
1. Undo the delete action with `Undo`
1. Redo the delete action with `Redo`
1. In manualTestFile.py modify the trange command in the progress bar from 100 to 2000. Run the Cell. As the cell is running hit the `Interrupt iPython Kernel` button
1. In manualTestFile.py modify the trange command in the progress bar from 100 to 2000. Run the Cell. As the cell is running hit the `Interrupt Jupyter Kernel` button
1. The progress bar should be interrupted and you should see a KeyboardInterrupt error message in the output
1. Test the `Restart iPython kernel` command. Kernel should be restarted and you should see a status output message for the kernel restart
1. Test the `Restart Jupyter kernel` command. Kernel should be restarted and you should see a status output message for the kernel restart
1. Use the expand all input and collapse all input commands to collapse all cell inputs
- [ ] Verify theming works
1. Start Python Interactive window
Expand Down
1 change: 1 addition & 0 deletions news/3 Code Health/14309.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Change message from `IPython kernel` to `Jupyter kernel`.
16 changes: 8 additions & 8 deletions package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@
"python.command.python.datascience.notebookeditor.removeallcells.title": "Delete All Notebook Editor Cells",
"python.command.python.datascience.notebookeditor.runselectedcell.title": "Run Selected Notebook Cell",
"python.command.python.datascience.notebookeditor.addcellbelow.title": "Add Empty Cell to Notebook File",
"python.command.python.datascience.interruptkernel.title": "Interrupt IPython Kernel",
"python.command.python.datascience.restartkernel.title": "Restart IPython Kernel",
"python.command.python.datascience.interruptkernel.title": "Interrupt Jupyter Kernel",
"python.command.python.datascience.restartkernel.title": "Restart Jupyter Kernel",
"python.command.python.datascience.expandallcells.title": "Expand All Python Interactive Cells",
"python.command.python.datascience.collapseallcells.title": "Collapse All Python Interactive Cells",
"python.command.python.datascience.addcellbelow.title": "Add Empty Cell to File",
Expand Down Expand Up @@ -180,7 +180,7 @@
"DataScience.importingFormat": "Importing {0}",
"DataScience.startingJupyter": "Starting Jupyter server",
"DataScience.connectingToJupyter": "Connecting to Jupyter server",
"DataScience.connectingToIPyKernel": "Connecting to IPython kernel",
"DataScience.connectingToIPyKernel": "Connecting to Jupyter kernel",
"DataScience.connectedToIPyKernel": "Connected.",
"DataScience.connected": "Connected",
"DataScience.disconnected": "Disconnected",
Expand Down Expand Up @@ -233,7 +233,7 @@
"ExtensionChannels.startingDownloadOutputMessage": "Starting download for Insiders build.",
"Interpreters.environmentPromptMessage": "We noticed a new virtual environment has been created. Do you want to select it for the workspace folder?",
"DataScience.reloadAfterChangingJupyterServerConnection": "Please reload VS Code when changing the Jupyter Server connection.",
"DataScience.restartKernelMessage": "Do you want to restart the IPython kernel? All variables will be lost.",
"DataScience.restartKernelMessage": "Do you want to restart the Jupyter kernel? All variables will be lost.",
"DataScience.restartKernelMessageYes": "Yes",
"DataScience.restartKernelMessageNo": "No",
"DataScience.restartingKernelFailed": "Kernel restart failed. Jupyter server is hung. Please reload VS Code.",
Expand All @@ -242,12 +242,12 @@
"DataScienceSurveyBanner.bannerLabelYes": "Yes, take survey now",
"DataScienceSurveyBanner.bannerLabelNo": "No, thanks",
"InteractiveShiftEnterBanner.bannerMessage": "Would you like to run code in the 'Python Interactive' window (an IPython console) for 'shift-enter'? Select 'No' to continue to run code in the Python Terminal. This can be changed later in settings.",
"DataScience.restartingKernelStatus": "Restarting IPython Kernel",
"DataScience.restartingKernelStatus": "Restarting Jupyter Kernel",
"DataScience.executingCode": "Executing Cell",
"DataScience.collapseAll": "Collapse all cell inputs",
"DataScience.expandAll": "Expand all cell inputs",
"DataScience.export": "Export as Jupyter notebook",
"DataScience.restartServer": "Restart IPython kernel",
"DataScience.restartServer": "Restart Jupyter kernel",
"DataScience.undo": "Undo",
"DataScience.redo": "Redo",
"DataScience.clearAll": "Remove all cells",
Expand Down Expand Up @@ -309,7 +309,7 @@
"diagnostics.checkIsort5UpgradeGuide": "We found outdated configuration for sorting imports in this workspace. Check the [isort upgrade guide](https://aka.ms/AA9j5x4) to update your settings.",
"diagnostics.yesUpdateLaunch": "Yes, update launch.json",
"diagnostics.invalidTestSettings": "Your settings needs to be updated to change the setting \"python.unitTest.\" to \"python.testing.\", otherwise testing Python code using the extension may not work. Would you like to automatically update your settings now?",
"DataScience.interruptKernel": "Interrupt IPython kernel",
"DataScience.interruptKernel": "Interrupt Jupyter kernel",
"DataScience.clearAllOutput": "Clear All Output",
"DataScience.exportingFormat": "Exporting {0}",
"DataScience.exportCancel": "Cancel",
Expand All @@ -318,7 +318,7 @@
"Common.yesPlease": "Yes, please",
"DataScience.importChangeDirectoryComment": "{0} Change working directory from the workspace root to the ipynb file location. Turn this addition off with the DataScience.changeDirOnImportExport setting",
"DataScience.exportChangeDirectoryComment": "# Change directory to VSCode workspace root so that relative path loads work correctly. Turn this addition off with the DataScience.changeDirOnImportExport setting",
"DataScience.interruptKernelStatus": "Interrupting IPython Kernel",
"DataScience.interruptKernelStatus": "Interrupting Jupyter Kernel",
"DataScience.restartKernelAfterInterruptMessage": "Interrupting the kernel timed out. Do you want to restart the kernel instead? All variables will be lost.",
"DataScience.pythonInterruptFailedHeader": "Keyboard interrupt crashed the kernel. Kernel restarted.",
"DataScience.sysInfoURILabel": "Jupyter Server URI: ",
Expand Down
4 changes: 2 additions & 2 deletions package.nls.pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"python.command.python.datascience.undocells.title": "Cofnij ostatnią akcję IPythona",
"python.command.python.datascience.redocells.title": "Ponów ostatnią akcję IPythona",
"python.command.python.datascience.removeallcells.title": "Usuń wszystkie komórki IPythona",
"python.command.python.datascience.interruptkernel.title": "Przerwij IPython Kernel",
"python.command.python.datascience.restartkernel.title": "Restartuj IPython Kernel",
"python.command.python.datascience.interruptkernel.title": "Przerwij Jupyter Kernel",
"python.command.python.datascience.restartkernel.title": "Restartuj Jupyter Kernel",
"python.command.python.datascience.expandallcells.title": "Rozwiń wszystkie komórki IPythona",
"python.command.python.datascience.collapseallcells.title": "Zwiń wszystkie komórki IPythona"
}
12 changes: 6 additions & 6 deletions src/client/common/utils/localize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ export namespace DataScience {
);
export const importingFormat = localize('DataScience.importingFormat', 'Importing {0}');
export const startingJupyter = localize('DataScience.startingJupyter', 'Starting Jupyter server');
export const connectingIPyKernel = localize('DataScience.connectingToIPyKernel', 'Connecting to IPython kernel');
export const connectingIPyKernel = localize('DataScience.connectingToIPyKernel', 'Connecting to Jupyter kernel');
export const connectedToIPyKernel = localize('DataScience.connectedToIPyKernel', 'Connected.');
export const connectingToJupyter = localize('DataScience.connectingToJupyter', 'Connecting to Jupyter server');
export const exportingFormat = localize('DataScience.exportingFormat', 'Exporting {0}');
Expand Down Expand Up @@ -550,7 +550,7 @@ export namespace DataScience {
"Don't Ask Again"
);
export const restartKernelMessageNo = localize('DataScience.restartKernelMessageNo', 'Cancel');
export const restartingKernelStatus = localize('DataScience.restartingKernelStatus', 'Restarting IPython Kernel');
export const restartingKernelStatus = localize('DataScience.restartingKernelStatus', 'Restarting Jupyter Kernel');
export const restartingKernelFailed = localize(
'DataScience.restartingKernelFailed',
'Kernel restart failed. Jupyter server is hung. Please reload VS code.'
Expand All @@ -569,7 +569,7 @@ export namespace DataScience {
export const collapseSingle = localize('DataScience.collapseSingle', 'Collapse');
export const expandSingle = localize('DataScience.expandSingle', 'Expand');
export const exportKey = localize('DataScience.export', 'Export as Jupyter notebook');
export const restartServer = localize('DataScience.restartServer', 'Restart IPython Kernel');
export const restartServer = localize('DataScience.restartServer', 'Restart Jupyter Kernel');
export const undo = localize('DataScience.undo', 'Undo');
export const redo = localize('DataScience.redo', 'Redo');
export const save = localize('DataScience.save', 'Save file');
Expand Down Expand Up @@ -662,15 +662,15 @@ export namespace DataScience {
export const notebookVersionFormat = localize('DataScience.notebookVersionFormat', 'Jupyter Notebook Version: {0}');
export const jupyterKernelSpecNotFound = localize(
'DataScience.jupyterKernelSpecNotFound',
'Cannot create a IPython kernel spec and none are available for use'
'Cannot create a Jupyter kernel spec and none are available for use'
);
export const jupyterKernelSpecModuleNotFound = localize(
'DataScience.jupyterKernelSpecModuleNotFound',
"'Kernelspec' module not installed in the selected interpreter ({0}).\n Please re-install or update 'jupyter'."
);
export const interruptKernel = localize('DataScience.interruptKernel', 'Interrupt IPython Kernel');
export const interruptKernel = localize('DataScience.interruptKernel', 'Interrupt Jupyter Kernel');
export const clearAllOutput = localize('DataScience.clearAllOutput', 'Clear All Output');
export const interruptKernelStatus = localize('DataScience.interruptKernelStatus', 'Interrupting IPython Kernel');
export const interruptKernelStatus = localize('DataScience.interruptKernelStatus', 'Interrupting Jupyter Kernel');
export const exportCancel = localize('DataScience.exportCancel', 'Cancel');
export const exportPythonQuickPickLabel = localize('DataScience.exportPythonQuickPickLabel', 'Python Script');
export const exportHTMLQuickPickLabel = localize('DataScience.exportHTMLQuickPickLabel', 'HTML');
Expand Down
4 changes: 2 additions & 2 deletions src/datascience-ui/history-react/interactivePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ ${buildSettingsCss(this.props.settings)}`}</style>
<ImageButton
baseTheme={this.props.baseTheme}
onClick={this.props.restartKernel}
tooltip={getLocString('DataScience.restartServer', 'Restart IPython kernel')}
tooltip={getLocString('DataScience.restartServer', 'Restart Jupyter kernel')}
>
<Image
baseTheme={this.props.baseTheme}
Expand All @@ -147,7 +147,7 @@ ${buildSettingsCss(this.props.settings)}`}</style>
<ImageButton
baseTheme={this.props.baseTheme}
onClick={this.props.interruptKernel}
tooltip={getLocString('DataScience.interruptKernel', 'Interrupt IPython kernel')}
tooltip={getLocString('DataScience.interruptKernel', 'Interrupt Jupyter kernel')}
>
<Image
baseTheme={this.props.baseTheme}
Expand Down
4 changes: 2 additions & 2 deletions src/datascience-ui/native-editor/toolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export class Toolbar extends React.PureComponent<INativeEditorToolbarProps> {
onClick={this.props.restartKernel}
disabled={!canRestartAndInterruptKernel || !this.props.isNotebookTrusted}
className="native-button"
tooltip={getLocString('DataScience.restartServer', 'Restart IPython kernel')}
tooltip={getLocString('DataScience.restartServer', 'Restart Jupyter kernel')}
>
<Image
baseTheme={this.props.baseTheme}
Expand All @@ -185,7 +185,7 @@ export class Toolbar extends React.PureComponent<INativeEditorToolbarProps> {
onClick={this.props.interruptKernel}
disabled={!canRestartAndInterruptKernel || !this.props.isNotebookTrusted}
className="native-button"
tooltip={getLocString('DataScience.interruptKernel', 'Interrupt IPython kernel')}
tooltip={getLocString('DataScience.interruptKernel', 'Interrupt Jupyter kernel')}
>
<Image
baseTheme={this.props.baseTheme}
Expand Down