Skip to content

Commit 47a9a18

Browse files
committed
DataScience: Update debugger to point to debugpy (microsoft#10214)
* Update datascience bits to debugpy. * Cleanup
1 parent e03bc0b commit 47a9a18

File tree

5 files changed

+109
-105
lines changed

5 files changed

+109
-105
lines changed

news/3 Code Health/10211.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update data science component to use `debugpy`.

package.nls.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,16 +370,16 @@
370370
"DataScience.debugStopCommandTitle": "Stop",
371371
"DataScience.runCurrentCellAndAddBelow": "Run current and add cell below",
372372
"DataScience.variableExplorerDisabledDuringDebugging": "Please see the Debug Side Bar's VARIABLES section.",
373-
"DataScience.jupyterDebuggerNotInstalledError": "Pip module ptvsd is required for debugging cells. You will need to install it to debug cells.",
374-
"DataScience.jupyterDebuggerPtvsdParseError": "Unable to parse ptvsd output, please log an issue with https://github.com/microsoft/vscode-python",
373+
"DataScience.jupyterDebuggerNotInstalledError": "Pip module {0} is required for debugging cells. You will need to install it to debug cells.",
374+
"DataScience.jupyterDebuggerOutputParseError": "Unable to parse {0} output, please log an issue with https://github.com/microsoft/vscode-python",
375375
"DataScience.jupyterDebuggerPortNotAvailableError": "Port {0} cannot be opened for debugging. Please specify a different port in the remoteDebuggerPort setting.",
376376
"DataScience.jupyterDebuggerPortBlockedError": "Port {0} cannot be connected to for debugging. Please let port {0} through your firewall.",
377377
"DataScience.jupyterDebuggerPortNotAvailableSearchError": "Ports in the range {0}-{1} cannot be found for debugging. Please specify a port in the remoteDebuggerPort setting.",
378378
"DataScience.jupyterDebuggerPortBlockedSearchError": "A port cannot be connected to for debugging. Please let ports {0}-{1} through your firewall.",
379-
"DataScience.jupyterDebuggerInstallPtvsdNew": "Pip module ptvsd is required for debugging cells. Install ptvsd and continue to debug cell?",
380-
"DataScience.jupyterDebuggerInstallPtvsdUpdate": "The version of ptvsd installed does not support debugging cells. Update ptvsd to newest version and continue to debug cell?",
381-
"DataScience.jupyterDebuggerInstallPtvsdYes": "Yes",
382-
"DataScience.jupyterDebuggerInstallPtvsdNo": "No",
379+
"DataScience.jupyterDebuggerInstallNew": "Pip module {0} is required for debugging cells. Install {0} and continue to debug cell?",
380+
"DataScience.jupyterDebuggerInstallUpdate": "The version of {0} installed does not support debugging cells. Update {0} to newest version and continue to debug cell?",
381+
"DataScience.jupyterDebuggerInstallYes": "Yes",
382+
"DataScience.jupyterDebuggerInstallNo": "No",
383383
"DataScience.cellStopOnErrorFormatMessage": "{0} cells were canceled due to an error in the previous cell.",
384384
"DataScience.instructionComments": "# To add a new cell, type '{0}'\n# To add a new markdown cell, type '{0} [markdown]'\n",
385385
"DataScience.scrollToCellTitleFormatMessage": "Go to [{0}]",

src/client/common/utils/localize.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -611,11 +611,11 @@ export namespace DataScience {
611611
);
612612
export const jupyterDebuggerNotInstalledError = localize(
613613
'DataScience.jupyterDebuggerNotInstalledError',
614-
'Pip module ptvsd is required for debugging cells. You will need to install it to debug cells.'
614+
'Pip module {0} is required for debugging cells. You will need to install it to debug cells.'
615615
);
616-
export const jupyterDebuggerPtvsdParseError = localize(
617-
'DataScience.jupyterDebuggerPtvsdParseError',
618-
'Unable to parse ptvsd output, please log an issue with https://github.com/microsoft/vscode-python'
616+
export const jupyterDebuggerOutputParseError = localize(
617+
'DataScience.jupyterDebuggerOutputParseError',
618+
'Unable to parse {0} output, please log an issue with https://github.com/microsoft/vscode-python'
619619
);
620620
export const jupyterDebuggerPortNotAvailableError = localize(
621621
'DataScience.jupyterDebuggerPortNotAvailableError',
@@ -633,16 +633,16 @@ export namespace DataScience {
633633
'DataScience.jupyterDebuggerPortBlockedSearchError',
634634
'A port cannot be connected to for debugging. Please let ports {0}-{1} through your firewall.'
635635
);
636-
export const jupyterDebuggerInstallPtvsdNew = localize(
637-
'DataScience.jupyterDebuggerInstallPtvsdNew',
638-
'Pip module ptvsd is required for debugging cells. Install ptvsd and continue to debug cell?'
636+
export const jupyterDebuggerInstallNew = localize(
637+
'DataScience.jupyterDebuggerInstallNew',
638+
'Pip module {0} is required for debugging cells. Install {0} and continue to debug cell?'
639639
);
640-
export const jupyterDebuggerInstallPtvsdUpdate = localize(
641-
'DataScience.jupyterDebuggerInstallPtvsdUpdate',
642-
'The version of ptvsd installed does not support debugging cells. Update ptvsd to newest version and continue to debug cell?'
640+
export const jupyterDebuggerInstallUpdate = localize(
641+
'DataScience.jupyterDebuggerInstallUpdate',
642+
'The version of {0} installed does not support debugging cells. Update {0} to newest version and continue to debug cell?'
643643
);
644-
export const jupyterDebuggerInstallPtvsdYes = localize('DataScience.jupyterDebuggerInstallPtvsdYes', 'Yes');
645-
export const jupyterDebuggerInstallPtvsdNo = localize('DataScience.jupyterDebuggerInstallPtvsdNo', 'No');
644+
export const jupyterDebuggerInstallYes = localize('DataScience.jupyterDebuggerInstallYes', 'Yes');
645+
export const jupyterDebuggerInstallNo = localize('DataScience.jupyterDebuggerInstallNo', 'No');
646646
export const cellStopOnErrorFormatMessage = localize(
647647
'DataScience.cellStopOnErrorFormatMessage',
648648
'{0} cells were canceled due to an error in the previous cell.'

0 commit comments

Comments
 (0)