Remove more usage instances of sysPrefix (#15103)

microsoft · Feb 1, 2024 · aaf4e71 · aaf4e71
1 parent 606b065
commit aaf4e71
Show file tree

Hide file tree

Showing 40 changed files with 108 additions and 240 deletions.
diff --git a/src/api.unstable.d.ts b/src/api.unstable.d.ts
@@ -77,7 +77,6 @@ declare module './api' {
         displayName?: string;
         uri: Uri;
         version?: PythonVersion;
-        sysPrefix: string;
         envType?: EnvironmentType;
         envName?: string;
         envPath?: Uri;

diff --git a/src/kernels/errors/kernelErrorHandler.unit.test.ts b/src/kernels/errors/kernelErrorHandler.unit.test.ts
@@ -62,8 +62,7 @@ suite('Error Handler Unit Tests', () => {
     const jupyterInterpreter: PythonEnvironment = {
         displayName: 'Hello',
         uri: Uri.file('Some Path'),
-        id: Uri.file('Some Path').fsPath,
-        sysPrefix: ''
+        id: Uri.file('Some Path').fsPath
     };
     let disposables: IDisposable[] = [];
     let environments: PythonExtension['environments'];
@@ -181,7 +180,6 @@ suite('Error Handler Unit Tests', () => {
                 interpreter: {
                     uri: Uri.file('Hello There'),
                     id: Uri.file('Hello There').fsPath,
-                    sysPrefix: 'Something else',
                     displayName: 'Hello (Some Path)'
                 },
                 kernelSpec: {

diff --git a/src/kernels/execution/helpers.unit.test.ts b/src/kernels/execution/helpers.unit.test.ts
@@ -20,7 +20,6 @@ suite(`UpdateNotebookMetadata`, () => {
     const python36Global: PythonEnvironment = {
         uri: Uri.file('/usr/bin/python36'),
         id: Uri.file('/usr/bin/python36').fsPath,
-        sysPrefix: '/usr',
         displayName: 'Python 3.6',
         envType: EnvironmentType.Unknown
     };
@@ -33,7 +32,6 @@ suite(`UpdateNotebookMetadata`, () => {
     const python37Global: PythonEnvironment = {
         uri: Uri.file('/usr/bin/python37'),
         id: Uri.file('/usr/bin/python37').fsPath,
-        sysPrefix: '/usr',
         displayName: 'Python 3.7',
         envType: EnvironmentType.Unknown
     };

diff --git a/src/kernels/helpers.unit.test.ts b/src/kernels/helpers.unit.test.ts
@@ -96,8 +96,7 @@ suite('Kernel Connection Helpers', () => {
                     },
                     interpreter: {
                         uri: Uri.file('pyPath'),
-                        id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix'
+                        id: Uri.file('pyPath').fsPath
                     }
                 })
             );
@@ -116,7 +115,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envType: EnvironmentType.Unknown
                     }
                 })
@@ -136,7 +134,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something',
                         envType: EnvironmentType.Pipenv
@@ -158,7 +155,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Pipenv
@@ -180,7 +176,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '.env',
                         displayName: 'Something',
                         envType: EnvironmentType.Conda
@@ -202,7 +197,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '.env',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Conda
@@ -243,7 +237,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '.env',
                         displayName: 'Something 64-bit'
                     }
@@ -265,7 +258,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '.env',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Unknown
@@ -288,7 +280,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something',
                         envType: EnvironmentType.Pipenv
@@ -311,7 +302,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Pipenv
@@ -334,7 +324,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Conda
@@ -369,7 +358,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '.env',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Conda
@@ -404,7 +392,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '.env',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Conda
@@ -429,7 +416,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something 64-bit'
                     }
@@ -451,7 +437,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Unknown
@@ -486,7 +471,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Unknown
@@ -509,7 +493,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something',
                         envType: EnvironmentType.Pipenv
@@ -532,7 +515,6 @@ suite('Kernel Connection Helpers', () => {
                     interpreter: {
                         uri: Uri.file('pyPath'),
                         id: Uri.file('pyPath').fsPath,
-                        sysPrefix: 'sysPrefix',
                         envName: '',
                         displayName: 'Something 64-bit',
                         envType: EnvironmentType.Pipenv

diff --git a/src/kernels/jupyter/interpreter/jupyterInterpreterDependencyService.unit.test.ts b/src/kernels/jupyter/interpreter/jupyterInterpreterDependencyService.unit.test.ts
@@ -24,8 +24,7 @@ suite('Jupyter Interpreter Configuration', () => {
     let command: IJupyterCommand;
     const pythonInterpreter: PythonEnvironment = {
         uri: Uri.file(''),
-        id: Uri.file('').fsPath,
-        sysPrefix: ''
+        id: Uri.file('').fsPath
     };
     let disposables: Disposable[] = [];
     setup(() => {

diff --git a/src/kernels/jupyter/interpreter/jupyterInterpreterService.unit.test.ts b/src/kernels/jupyter/interpreter/jupyterInterpreterService.unit.test.ts
@@ -32,13 +32,11 @@ suite('Jupyter Interpreter Service', () => {
     const selectedJupyterInterpreter = createPythonInterpreter({ displayName: 'JupyterInterpreter' });
     const pythonInterpreter: PythonEnvironment = {
         uri: Uri.file('some path'),
-        id: Uri.file('some path').fsPath,
-        sysPrefix: ''
+        id: Uri.file('some path').fsPath
     };
     const secondPythonInterpreter: PythonEnvironment = {
         uri: Uri.file('second interpreter path'),
-        id: Uri.file('second interpreter path').fsPath,
-        sysPrefix: ''
+        id: Uri.file('second interpreter path').fsPath
     };
     let disposables: IDisposable[] = [];
 

diff --git a/src/kernels/jupyter/launcher/juypterServerProvider.unit.test.ts b/src/kernels/jupyter/launcher/juypterServerProvider.unit.test.ts
@@ -30,8 +30,7 @@ suite('Jupyter Server Provider', () => {
     let interpreterService: IInterpreterService;
     const workingPython: PythonEnvironment = {
         uri: Uri.file('/foo/bar/python.exe'),
-        id: Uri.file('/foo/bar/python.exe').fsPath,
-        sysPrefix: 'Python'
+        id: Uri.file('/foo/bar/python.exe').fsPath
     };
     let disposables: Disposable[] = [];
     let source: CancellationTokenSource;

diff --git a/src/kernels/jupyter/session/jupyterKernelService.unit.test.ts b/src/kernels/jupyter/session/jupyterKernelService.unit.test.ts
@@ -67,8 +67,7 @@ suite('JupyterKernelService', () => {
             interpreter: {
                 id: '/usr/bin/python3',
                 displayName: 'Python 3 Environment',
-                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3'),
-                sysPrefix: 'python'
+                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3')
             },
             id: '0'
         }),
@@ -92,7 +91,6 @@ suite('JupyterKernelService', () => {
                 id: '/usr/bin/conda/python3',
                 displayName: 'Conda Environment',
                 uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/conda/python3.exe' : '/usr/bin/conda/python3'),
-                sysPrefix: 'conda',
                 envType: EnvironmentType.Conda
             },
             id: '1'
@@ -115,16 +113,14 @@ suite('JupyterKernelService', () => {
                     interpreter: {
                         displayName: 'Python 3 Environment',
                         path: os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3',
-                        sysPrefix: 'python',
                         version: { major: 3, minor: 8, raw: '3.8', patch: 0 }
                     }
                 }
             },
             interpreter: {
                 id: '/usr/bin/python3',
                 displayName: 'Python 3 Environment',
-                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3'),
-                sysPrefix: 'python'
+                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3')
             },
             id: '2'
         }),
@@ -157,8 +153,7 @@ suite('JupyterKernelService', () => {
             interpreter: {
                 id: '/usr/bin/python',
                 displayName: 'Python 2 Environment',
-                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python.exe' : '/usr/bin/python'),
-                sysPrefix: 'python'
+                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python.exe' : '/usr/bin/python')
             },
             id: '4'
         }),
@@ -180,16 +175,14 @@ suite('JupyterKernelService', () => {
                     interpreter: {
                         displayName: 'Python 3 Environment',
                         path: os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3',
-                        sysPrefix: 'python',
                         version: { major: 3, minor: 8, raw: '3.8', patch: 0 }
                     }
                 }
             },
             interpreter: {
                 id: '/usr/bin/python3',
                 displayName: 'Python 3 Environment',
-                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3'),
-                sysPrefix: 'python'
+                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3')
             },
             id: '5'
         }),
@@ -222,8 +215,7 @@ suite('JupyterKernelService', () => {
             interpreter: {
                 id: '/usr/bin/python',
                 displayName: 'Python 2 Environment',
-                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python.exe' : '/usr/bin/python'),
-                sysPrefix: 'python'
+                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python.exe' : '/usr/bin/python')
             },
             id: '7'
         }),
@@ -245,16 +237,14 @@ suite('JupyterKernelService', () => {
                     interpreter: {
                         displayName: 'Python 3 Environment',
                         path: os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3',
-                        sysPrefix: 'python',
                         version: { major: 3, minor: 8, raw: '3.8', patch: 0 }
                     }
                 }
             },
             interpreter: {
                 id: '/usr/bin/python3',
                 displayName: 'Python 3 Environment',
-                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3'),
-                sysPrefix: 'python'
+                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python3.exe' : '/usr/bin/python3')
             },
             id: '8'
         }),
@@ -287,8 +277,7 @@ suite('JupyterKernelService', () => {
             interpreter: {
                 id: '/usr/bin/python',
                 displayName: 'Python 2 Environment',
-                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python.exe' : '/usr/bin/python'),
-                sysPrefix: 'python'
+                uri: Uri.file(os.platform() === 'win32' ? '/usr/bin/python.exe' : '/usr/bin/python')
             },
             id: '10'
         }),
@@ -310,7 +299,6 @@ suite('JupyterKernelService', () => {
                     interpreter: {
                         displayName: 'Conda base environment',
                         path: '/usr/conda/envs/base/python',
-                        sysPrefix: 'conda',
                         envType: EnvironmentType.Conda
                     }
                 },
@@ -324,7 +312,6 @@ suite('JupyterKernelService', () => {
                 uri: Uri.file(
                     os.platform() === 'win32' ? '/usr/conda/envs/base/python.exe' : '/usr/conda/envs/base/python'
                 ),
-                sysPrefix: 'conda',
                 envType: EnvironmentType.Conda
             },
             id: '11'
@@ -355,7 +342,6 @@ suite('JupyterKernelService', () => {
                             os.platform() === 'win32'
                                 ? '/usr/don/home/envs/sample/bin/python.exe'
                                 : '/usr/don/home/envs/sample/bin/python',
-                        sysPrefix: 'python',
                         version: { major: 3, minor: 8, raw: '3.8', patch: 0 }
                     }
                 },
@@ -370,8 +356,7 @@ suite('JupyterKernelService', () => {
                     os.platform() === 'win32'
                         ? '/usr/don/home/envs/sample/bin/python.exe'
                         : '/usr/don/home/envs/sample/bin/python'
-                ),
-                sysPrefix: 'python'
+                )
             },
             id: '12'
         }),
@@ -393,7 +378,6 @@ suite('JupyterKernelService', () => {
                             os.platform() === 'win32'
                                 ? '/usr/don/home/envs/sample/bin/python.exe'
                                 : '/usr/don/home/envs/sample/bin/python',
-                        sysPrefix: 'python',
                         version: { major: 3, minor: 8, raw: '3.8', patch: 0 }
                     }
                 },
@@ -408,8 +392,7 @@ suite('JupyterKernelService', () => {
                     os.platform() === 'win32'
                         ? '/usr/don/home/envs/sample/bin/python.exe'
                         : '/usr/don/home/envs/sample/bin/python'
-                ),
-                sysPrefix: 'python'
+                )
             },
             id: '13'
         }),
@@ -428,7 +411,6 @@ suite('JupyterKernelService', () => {
                             os.platform() === 'win32'
                                 ? '/usr/don/home/envs/sample/bin/python.exe'
                                 : '/usr/don/home/envs/sample/bin/python',
-                        sysPrefix: 'python',
                         version: { major: 3, minor: 8, raw: '3.8', patch: 0 }
                     }
                 },
@@ -443,8 +425,7 @@ suite('JupyterKernelService', () => {
                     os.platform() === 'win32'
                         ? '/usr/don/home/envs/sample/bin/python.exe'
                         : '/usr/don/home/envs/sample/bin/python'
-                ),
-                sysPrefix: 'python'
+                )
             },
             id: '14'
         })