Skip to content

Commit 5583df4

Browse files
authored
Change IPython kernel to Jupyter kernel (#14375)
1 parent 56553ce commit 5583df4

File tree

7 files changed

+23
-22
lines changed

7 files changed

+23
-22
lines changed

.github/test_plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,9 @@ def test_failure():
520520
1. Use `X` to delete all cells
521521
1. Undo the delete action with `Undo`
522522
1. Redo the delete action with `Redo`
523-
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
523+
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
524524
1. The progress bar should be interrupted and you should see a KeyboardInterrupt error message in the output
525-
1. Test the `Restart iPython kernel` command. Kernel should be restarted and you should see a status output message for the kernel restart
525+
1. Test the `Restart Jupyter kernel` command. Kernel should be restarted and you should see a status output message for the kernel restart
526526
1. Use the expand all input and collapse all input commands to collapse all cell inputs
527527
- [ ] Verify theming works
528528
1. Start Python Interactive window

news/3 Code Health/14309.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Change message from `IPython kernel` to `Jupyter kernel`.

package.nls.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
"python.command.python.datascience.notebookeditor.removeallcells.title": "Delete All Notebook Editor Cells",
109109
"python.command.python.datascience.notebookeditor.runselectedcell.title": "Run Selected Notebook Cell",
110110
"python.command.python.datascience.notebookeditor.addcellbelow.title": "Add Empty Cell to Notebook File",
111-
"python.command.python.datascience.interruptkernel.title": "Interrupt IPython Kernel",
112-
"python.command.python.datascience.restartkernel.title": "Restart IPython Kernel",
111+
"python.command.python.datascience.interruptkernel.title": "Interrupt Jupyter Kernel",
112+
"python.command.python.datascience.restartkernel.title": "Restart Jupyter Kernel",
113113
"python.command.python.datascience.expandallcells.title": "Expand All Python Interactive Cells",
114114
"python.command.python.datascience.collapseallcells.title": "Collapse All Python Interactive Cells",
115115
"python.command.python.datascience.addcellbelow.title": "Add Empty Cell to File",
@@ -180,7 +180,7 @@
180180
"DataScience.importingFormat": "Importing {0}",
181181
"DataScience.startingJupyter": "Starting Jupyter server",
182182
"DataScience.connectingToJupyter": "Connecting to Jupyter server",
183-
"DataScience.connectingToIPyKernel": "Connecting to IPython kernel",
183+
"DataScience.connectingToIPyKernel": "Connecting to Jupyter kernel",
184184
"DataScience.connectedToIPyKernel": "Connected.",
185185
"DataScience.connected": "Connected",
186186
"DataScience.disconnected": "Disconnected",
@@ -233,7 +233,7 @@
233233
"ExtensionChannels.startingDownloadOutputMessage": "Starting download for Insiders build.",
234234
"Interpreters.environmentPromptMessage": "We noticed a new virtual environment has been created. Do you want to select it for the workspace folder?",
235235
"DataScience.reloadAfterChangingJupyterServerConnection": "Please reload VS Code when changing the Jupyter Server connection.",
236-
"DataScience.restartKernelMessage": "Do you want to restart the IPython kernel? All variables will be lost.",
236+
"DataScience.restartKernelMessage": "Do you want to restart the Jupyter kernel? All variables will be lost.",
237237
"DataScience.restartKernelMessageYes": "Yes",
238238
"DataScience.restartKernelMessageNo": "No",
239239
"DataScience.restartingKernelFailed": "Kernel restart failed. Jupyter server is hung. Please reload VS Code.",
@@ -242,12 +242,12 @@
242242
"DataScienceSurveyBanner.bannerLabelYes": "Yes, take survey now",
243243
"DataScienceSurveyBanner.bannerLabelNo": "No, thanks",
244244
"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.",
245-
"DataScience.restartingKernelStatus": "Restarting IPython Kernel",
245+
"DataScience.restartingKernelStatus": "Restarting Jupyter Kernel",
246246
"DataScience.executingCode": "Executing Cell",
247247
"DataScience.collapseAll": "Collapse all cell inputs",
248248
"DataScience.expandAll": "Expand all cell inputs",
249249
"DataScience.export": "Export as Jupyter notebook",
250-
"DataScience.restartServer": "Restart IPython kernel",
250+
"DataScience.restartServer": "Restart Jupyter kernel",
251251
"DataScience.undo": "Undo",
252252
"DataScience.redo": "Redo",
253253
"DataScience.clearAll": "Remove all cells",
@@ -309,7 +309,7 @@
309309
"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.",
310310
"diagnostics.yesUpdateLaunch": "Yes, update launch.json",
311311
"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?",
312-
"DataScience.interruptKernel": "Interrupt IPython kernel",
312+
"DataScience.interruptKernel": "Interrupt Jupyter kernel",
313313
"DataScience.clearAllOutput": "Clear All Output",
314314
"DataScience.exportingFormat": "Exporting {0}",
315315
"DataScience.exportCancel": "Cancel",
@@ -318,7 +318,7 @@
318318
"Common.yesPlease": "Yes, please",
319319
"DataScience.importChangeDirectoryComment": "{0} Change working directory from the workspace root to the ipynb file location. Turn this addition off with the DataScience.changeDirOnImportExport setting",
320320
"DataScience.exportChangeDirectoryComment": "# Change directory to VSCode workspace root so that relative path loads work correctly. Turn this addition off with the DataScience.changeDirOnImportExport setting",
321-
"DataScience.interruptKernelStatus": "Interrupting IPython Kernel",
321+
"DataScience.interruptKernelStatus": "Interrupting Jupyter Kernel",
322322
"DataScience.restartKernelAfterInterruptMessage": "Interrupting the kernel timed out. Do you want to restart the kernel instead? All variables will be lost.",
323323
"DataScience.pythonInterruptFailedHeader": "Keyboard interrupt crashed the kernel. Kernel restarted.",
324324
"DataScience.sysInfoURILabel": "Jupyter Server URI: ",

package.nls.pl.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
"python.command.python.datascience.undocells.title": "Cofnij ostatnią akcję IPythona",
4040
"python.command.python.datascience.redocells.title": "Ponów ostatnią akcję IPythona",
4141
"python.command.python.datascience.removeallcells.title": "Usuń wszystkie komórki IPythona",
42-
"python.command.python.datascience.interruptkernel.title": "Przerwij IPython Kernel",
43-
"python.command.python.datascience.restartkernel.title": "Restartuj IPython Kernel",
42+
"python.command.python.datascience.interruptkernel.title": "Przerwij Jupyter Kernel",
43+
"python.command.python.datascience.restartkernel.title": "Restartuj Jupyter Kernel",
4444
"python.command.python.datascience.expandallcells.title": "Rozwiń wszystkie komórki IPythona",
4545
"python.command.python.datascience.collapseallcells.title": "Zwiń wszystkie komórki IPythona"
4646
}

src/client/common/utils/localize.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ export namespace DataScience {
515515
);
516516
export const importingFormat = localize('DataScience.importingFormat', 'Importing {0}');
517517
export const startingJupyter = localize('DataScience.startingJupyter', 'Starting Jupyter server');
518-
export const connectingIPyKernel = localize('DataScience.connectingToIPyKernel', 'Connecting to IPython kernel');
518+
export const connectingIPyKernel = localize('DataScience.connectingToIPyKernel', 'Connecting to Jupyter kernel');
519519
export const connectedToIPyKernel = localize('DataScience.connectedToIPyKernel', 'Connected.');
520520
export const connectingToJupyter = localize('DataScience.connectingToJupyter', 'Connecting to Jupyter server');
521521
export const exportingFormat = localize('DataScience.exportingFormat', 'Exporting {0}');
@@ -550,7 +550,7 @@ export namespace DataScience {
550550
"Don't Ask Again"
551551
);
552552
export const restartKernelMessageNo = localize('DataScience.restartKernelMessageNo', 'Cancel');
553-
export const restartingKernelStatus = localize('DataScience.restartingKernelStatus', 'Restarting IPython Kernel');
553+
export const restartingKernelStatus = localize('DataScience.restartingKernelStatus', 'Restarting Jupyter Kernel');
554554
export const restartingKernelFailed = localize(
555555
'DataScience.restartingKernelFailed',
556556
'Kernel restart failed. Jupyter server is hung. Please reload VS code.'
@@ -569,7 +569,7 @@ export namespace DataScience {
569569
export const collapseSingle = localize('DataScience.collapseSingle', 'Collapse');
570570
export const expandSingle = localize('DataScience.expandSingle', 'Expand');
571571
export const exportKey = localize('DataScience.export', 'Export as Jupyter notebook');
572-
export const restartServer = localize('DataScience.restartServer', 'Restart IPython Kernel');
572+
export const restartServer = localize('DataScience.restartServer', 'Restart Jupyter Kernel');
573573
export const undo = localize('DataScience.undo', 'Undo');
574574
export const redo = localize('DataScience.redo', 'Redo');
575575
export const save = localize('DataScience.save', 'Save file');
@@ -662,15 +662,15 @@ export namespace DataScience {
662662
export const notebookVersionFormat = localize('DataScience.notebookVersionFormat', 'Jupyter Notebook Version: {0}');
663663
export const jupyterKernelSpecNotFound = localize(
664664
'DataScience.jupyterKernelSpecNotFound',
665-
'Cannot create a IPython kernel spec and none are available for use'
665+
'Cannot create a Jupyter kernel spec and none are available for use'
666666
);
667667
export const jupyterKernelSpecModuleNotFound = localize(
668668
'DataScience.jupyterKernelSpecModuleNotFound',
669669
"'Kernelspec' module not installed in the selected interpreter ({0}).\n Please re-install or update 'jupyter'."
670670
);
671-
export const interruptKernel = localize('DataScience.interruptKernel', 'Interrupt IPython Kernel');
671+
export const interruptKernel = localize('DataScience.interruptKernel', 'Interrupt Jupyter Kernel');
672672
export const clearAllOutput = localize('DataScience.clearAllOutput', 'Clear All Output');
673-
export const interruptKernelStatus = localize('DataScience.interruptKernelStatus', 'Interrupting IPython Kernel');
673+
export const interruptKernelStatus = localize('DataScience.interruptKernelStatus', 'Interrupting Jupyter Kernel');
674674
export const exportCancel = localize('DataScience.exportCancel', 'Cancel');
675675
export const exportPythonQuickPickLabel = localize('DataScience.exportPythonQuickPickLabel', 'Python Script');
676676
export const exportHTMLQuickPickLabel = localize('DataScience.exportHTMLQuickPickLabel', 'HTML');

src/datascience-ui/history-react/interactivePanel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ ${buildSettingsCss(this.props.settings)}`}</style>
136136
<ImageButton
137137
baseTheme={this.props.baseTheme}
138138
onClick={this.props.restartKernel}
139-
tooltip={getLocString('DataScience.restartServer', 'Restart IPython kernel')}
139+
tooltip={getLocString('DataScience.restartServer', 'Restart Jupyter kernel')}
140140
>
141141
<Image
142142
baseTheme={this.props.baseTheme}
@@ -147,7 +147,7 @@ ${buildSettingsCss(this.props.settings)}`}</style>
147147
<ImageButton
148148
baseTheme={this.props.baseTheme}
149149
onClick={this.props.interruptKernel}
150-
tooltip={getLocString('DataScience.interruptKernel', 'Interrupt IPython kernel')}
150+
tooltip={getLocString('DataScience.interruptKernel', 'Interrupt Jupyter kernel')}
151151
>
152152
<Image
153153
baseTheme={this.props.baseTheme}

src/datascience-ui/native-editor/toolbar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export class Toolbar extends React.PureComponent<INativeEditorToolbarProps> {
172172
onClick={this.props.restartKernel}
173173
disabled={!canRestartAndInterruptKernel || !this.props.isNotebookTrusted}
174174
className="native-button"
175-
tooltip={getLocString('DataScience.restartServer', 'Restart IPython kernel')}
175+
tooltip={getLocString('DataScience.restartServer', 'Restart Jupyter kernel')}
176176
>
177177
<Image
178178
baseTheme={this.props.baseTheme}
@@ -185,7 +185,7 @@ export class Toolbar extends React.PureComponent<INativeEditorToolbarProps> {
185185
onClick={this.props.interruptKernel}
186186
disabled={!canRestartAndInterruptKernel || !this.props.isNotebookTrusted}
187187
className="native-button"
188-
tooltip={getLocString('DataScience.interruptKernel', 'Interrupt IPython kernel')}
188+
tooltip={getLocString('DataScience.interruptKernel', 'Interrupt Jupyter kernel')}
189189
>
190190
<Image
191191
baseTheme={this.props.baseTheme}

0 commit comments

Comments
 (0)