Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 362eb34

Browse files
author
Kartik Raj
authored
Prep for trusted workspaces work (#16508)
* Implement python.defaultInterpreterPath in workspace scope * Move DeprecatePythonPath experiment to new framework and retire old framework * Remove execution isolation script * Do not delete old user setting while migrating interpreter settings * Modify the python path deprecation prompt * Add deprecate pythonPath doc in package.json * Add default Interpreter path entry at the bottom of the interpreter list * Update VSCode engine to 1.57 * Restore Deprecate PythonPath experiment for compatibility * Remove environments security related to discovery (#17) * Remove environments security related to autoselection (#18) * Fix ESLint errors related to security undo work * Add experiment to package.json * Edit changelog to include enhancement details * Delete news entry
1 parent c1018da commit 362eb34

File tree

86 files changed

+478
-2740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+478
-2740
lines changed

‎.eslintignore

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ src/test/interpreters/mocks.ts
4141
src/test/interpreters/interpreterVersion.unit.test.ts
4242
src/test/interpreters/virtualEnvs/index.unit.test.ts
4343
src/test/interpreters/virtualEnvs/condaInheritEnvPrompt.unit.test.ts
44-
src/test/interpreters/autoSelection/interpreterSecurity/interpreterEvaluation.unit.test.ts
45-
src/test/interpreters/autoSelection/interpreterSecurity/interpreterSecurityService.unit.test.ts
4644
src/test/interpreters/autoSelection/rules/settings.unit.test.ts
4745
src/test/interpreters/autoSelection/rules/cached.unit.test.ts
4846
src/test/interpreters/autoSelection/rules/winRegistry.unit.test.ts
@@ -56,8 +54,6 @@ src/test/interpreters/helpers.unit.test.ts
5654
src/test/interpreters/currentPathService.unit.test.ts
5755
src/test/interpreters/display.unit.test.ts
5856

59-
src/test/configuration/interpreterSelector/interpreterSelector.unit.test.ts
60-
6157
src/test/terminals/codeExecution/terminalCodeExec.unit.test.ts
6258
src/test/terminals/codeExecution/codeExecutionManager.unit.test.ts
6359
src/test/terminals/codeExecution/djangoShellCodeExect.unit.test.ts
@@ -93,7 +89,6 @@ src/test/activation/activeResource.unit.test.ts
9389
src/test/activation/node/languageServerChangeHandler.unit.test.ts
9490
src/test/activation/node/activator.unit.test.ts
9591
src/test/activation/extensionSurvey.unit.test.ts
96-
src/test/activation/activationManager.unit.test.ts
9792

9893
src/test/utils/fs.ts
9994

@@ -111,7 +106,6 @@ src/test/api.functional.test.ts
111106
src/test/testing/argsService.test.ts
112107
src/test/testing/mocks.ts
113108
src/test/testing/debugger.test.ts
114-
src/test/testing/serviceRegistry.ts
115109
src/test/testing/unittest/unittest.test.ts
116110
src/test/testing/unittest/unittest.discovery.unit.test.ts
117111
src/test/testing/unittest/unittest.discovery.test.ts
@@ -180,7 +174,6 @@ src/test/common/utils/cacheUtils.unit.test.ts
180174
src/test/common/utils/decorators.unit.test.ts
181175
src/test/common/utils/localize.functional.test.ts
182176
src/test/common/utils/version.unit.test.ts
183-
src/test/common/configSettings/configSettings.pythonPath.unit.test.ts
184177
src/test/common/configSettings/configSettings.unit.test.ts
185178
src/test/common/featureDeprecationManager.unit.test.ts
186179
src/test/common/serviceRegistry.unit.test.ts
@@ -287,7 +280,6 @@ src/client/interpreter/configuration/interpreterComparer.ts
287280
src/client/interpreter/configuration/interpreterSelector/commands/base.ts
288281
src/client/interpreter/configuration/interpreterSelector/commands/resetInterpreter.ts
289282
src/client/interpreter/configuration/interpreterSelector/commands/setShebangInterpreter.ts
290-
src/client/interpreter/configuration/interpreterSelector/interpreterSelector.ts
291283
src/client/interpreter/configuration/pythonPathUpdaterServiceFactory.ts
292284
src/client/interpreter/configuration/services/globalUpdaterService.ts
293285
src/client/interpreter/configuration/services/workspaceUpdaterService.ts
@@ -296,9 +288,6 @@ src/client/interpreter/helpers.ts
296288
src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts
297289
src/client/interpreter/virtualEnvs/types.ts
298290
src/client/interpreter/virtualEnvs/index.ts
299-
src/client/interpreter/autoSelection/interpreterSecurity/interpreterSecurityStorage.ts
300-
src/client/interpreter/autoSelection/interpreterSecurity/interpreterEvaluation.ts
301-
src/client/interpreter/autoSelection/interpreterSecurity/interpreterSecurityService.ts
302291
src/client/interpreter/autoSelection/rules/baseRule.ts
303292
src/client/interpreter/autoSelection/rules/winRegistry.ts
304293
src/client/interpreter/autoSelection/rules/settings.ts
@@ -353,7 +342,6 @@ src/client/activation/languageServer/languageServerPackageService.ts
353342
src/client/activation/languageServer/analysisOptions.ts
354343
src/client/activation/languageServer/activator.ts
355344
src/client/activation/commands.ts
356-
src/client/activation/activationManager.ts
357345
src/client/activation/progress.ts
358346
src/client/activation/extensionSurvey.ts
359347
src/client/activation/common/languageServerChangeHandler.ts
@@ -509,7 +497,6 @@ src/client/common/dotnet/services/macCompatibilityService.ts
509497
src/client/common/dotnet/services/linuxCompatibilityService.ts
510498
src/client/common/dotnet/services/windowsCompatibilityService.ts
511499
src/client/common/logger.ts
512-
src/client/common/constants.ts
513500
src/client/common/variables/serviceRegistry.ts
514501
src/client/common/variables/environment.ts
515502
src/client/common/variables/types.ts
@@ -523,7 +510,6 @@ src/client/common/cancellation.ts
523510
src/client/common/interpreterPathService.ts
524511
src/client/common/startPage/startPageMessageListener.ts
525512
src/client/common/application/customEditorService.ts
526-
src/client/common/application/commands.ts
527513
src/client/common/application/applicationShell.ts
528514
src/client/common/application/languageService.ts
529515
src/client/common/application/notebook.ts

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@
1212
([#16141](https://github.com/Microsoft/vscode-python/issues/16141))
1313
1. Ensure users upgrade to v0.2.0 of the torch-tb-profiler TensorBoard plugin to access jump-to-source functionality.
1414
([#16330](https://github.com/Microsoft/vscode-python/issues/16330))
15+
1. Added `python.defaultInterpreterPath` setting at workspace level when in `pythonDeprecatePythonPath` experiment.
16+
([#16485](https://github.com/Microsoft/vscode-python/issues/16485))
17+
1. Added default Interpreter path entry at the bottom of the interpreter list.
18+
([#16485](https://github.com/Microsoft/vscode-python/issues/16485))
19+
1. Remove execution isolation script used to run tools.
20+
([#16485](https://github.com/Microsoft/vscode-python/issues/16485))
21+
1. Show `python.pythonPath` deprecation prompt when in `pythonDeprecatePythonPath` experiment.
22+
([#16485](https://github.com/Microsoft/vscode-python/issues/16485))
23+
1. Do not show safety prompt before autoselecting a workspace interpreter.
24+
([#16485](https://github.com/Microsoft/vscode-python/issues/16485))
25+
1. Assume workspace interpreters are safe to execute for discovery.
26+
([#16485](https://github.com/Microsoft/vscode-python/issues/16485))
1527

1628
### Fixes
1729
1. Fixes a bug in the bandit linter where messages weren't being propagated to the editor.

‎package.json

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"theme": "dark"
3838
},
3939
"engines": {
40-
"vscode": "^1.54.0"
40+
"vscode": "^1.57.0"
4141
},
4242
"keywords": [
4343
"python",
@@ -88,7 +88,6 @@
8888
"onCommand:python.switchToDailyChannel",
8989
"onCommand:python.switchToWeeklyChannel",
9090
"onCommand:python.clearWorkspaceInterpreter",
91-
"onCommand:python.resetInterpreterSecurityStorage",
9291
"onCommand:python.startPage.open",
9392
"onCommand:python.enableSourceMapSupport",
9493
"onCommand:python.launchTensorBoard",
@@ -235,11 +234,6 @@
235234
"title": "%python.command.python.clearWorkspaceInterpreter.title%",
236235
"category": "Python"
237236
},
238-
{
239-
"command": "python.resetInterpreterSecurityStorage",
240-
"title": "%python.command.python.resetInterpreterSecurityStorage.title%",
241-
"category": "Python"
242-
},
243237
{
244238
"command": "python.refactorExtractVariable",
245239
"title": "%python.command.python.refactorExtractVariable.title%",
@@ -488,11 +482,6 @@
488482
"title": "%python.command.python.clearWorkspaceInterpreter.title%",
489483
"category": "Python"
490484
},
491-
{
492-
"command": "python.resetInterpreterSecurityStorage",
493-
"title": "%python.command.python.resetInterpreterSecurityStorage.title%",
494-
"category": "Python"
495-
},
496485
{
497486
"command": "python.viewOutput",
498487
"title": "%python.command.python.viewOutput.title%",
@@ -1126,15 +1115,15 @@
11261115
"python.defaultInterpreterPath": {
11271116
"type": "string",
11281117
"default": "python",
1129-
"description": "Path to Python, you can use a custom version of Python by modifying this setting to include the full path.",
1130-
"scope": "machine"
1118+
"description": "Path to Python, you can use a custom version of Python by modifying this setting to include the full path. This default setting is used as a fallback if no interpreter is selected for the workspace. The extension will also not set nor change the value of this setting, it will only read from it.",
1119+
"scope": "resource"
11311120
},
11321121
"python.experiments.optInto": {
11331122
"type": "array",
11341123
"default": [],
11351124
"items": {
11361125
"enum": [
1137-
"DeprecatePythonPath - experiment",
1126+
"pythonDeprecatePythonPath",
11381127
"pythonTensorboardExperiment",
11391128
"pythonDiscoveryModule",
11401129
"pythonDiscoveryModuleWithoutWatcher",
@@ -1151,7 +1140,7 @@
11511140
"default": [],
11521141
"items": {
11531142
"enum": [
1154-
"DeprecatePythonPath - experiment",
1143+
"pythonDeprecatePythonPath",
11551144
"pythonTensorboardExperiment",
11561145
"pythonDiscoveryModule",
11571146
"pythonDiscoveryModuleWithoutWatcher",
@@ -1713,7 +1702,7 @@
17131702
"python.pythonPath": {
17141703
"type": "string",
17151704
"default": "python",
1716-
"description": "Path to Python, you can use a custom version of Python by modifying this setting to include the full path.",
1705+
"description": "(DEPRECATED: Note this setting is not used when in pythonDeprecatePythonPath experiment) Path to Python, you can use a custom version of Python by modifying this setting to include the full path.",
17171706
"scope": "resource"
17181707
},
17191708
"python.condaPath": {
@@ -1865,12 +1854,6 @@
18651854
"description": "Enable auto run test discovery when saving a test file.",
18661855
"scope": "resource"
18671856
},
1868-
"python.useIsolation": {
1869-
"type": "boolean",
1870-
"default": true,
1871-
"description": "Execute tools in isolation from the workspace.",
1872-
"scope": "machine"
1873-
},
18741857
"python.venvFolders": {
18751858
"type": "array",
18761859
"default": [],

‎package.nls.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"python.command.python.switchToDailyChannel.title": "Switch to Insiders Daily Channel",
1212
"python.command.python.switchToWeeklyChannel.title": "Switch to Insiders Weekly Channel",
1313
"python.command.python.clearWorkspaceInterpreter.title": "Clear Workspace Interpreter Setting",
14-
"python.command.python.resetInterpreterSecurityStorage.title": "Reset Stored Info for Untrusted Interpreters",
1514
"python.command.python.refactorExtractVariable.title": "Extract Variable",
1615
"python.command.python.refactorExtractMethod.title": "Extract Method",
1716
"python.command.python.viewOutput.title": "Show Output",
@@ -61,7 +60,6 @@
6160
"Interpreters.entireWorkspace": "Entire workspace",
6261
"Interpreters.pythonInterpreterPath": "Python interpreter path: {0}",
6362
"Interpreters.LoadingInterpreters": "Loading Python Interpreters",
64-
"Interpreters.unsafeInterpreterMessage": "We found a Python environment in this workspace. Do you want to select it to start up the features in the Python extension? Only accept if you trust this environment.",
6563
"Interpreters.condaInheritEnvMessage": "We noticed you're using a conda environment. If you are experiencing issues with this environment in the integrated terminal, we recommend that you let the Python extension change \"terminal.integrated.inheritEnv\" to false in your user settings.",
6664
"Logging.CurrentWorkingDirectory": "cwd:",
6765
"InterpreterQuickPickList.quickPickListPlaceholder": "Current: {0}",
@@ -74,6 +72,7 @@
7472
"InterpreterQuickPickList.browsePath.label": "Find...",
7573
"InterpreterQuickPickList.browsePath.detail": "Browse your file system to find a Python interpreter.",
7674
"InterpreterQuickPickList.browsePath.title": "Select Python interpreter",
75+
"InterpreterQuickPickList.defaultInterpreterPath.label": "Use default Python interpreter path",
7776
"diagnostics.upgradeCodeRunner": "Please update the Code Runner extension for it to be compatible with the Python extension.",
7877
"Common.bannerLabelYes": "Yes",
7978
"Common.bannerLabelNo": "No",
@@ -119,7 +118,7 @@
119118
"Installer.searchForHelp": "Search for help",
120119
"Installer.couldNotInstallLibrary": "Could not install {0}. If pip is not available, please use the package manager of your choice to manually install this library into your Python environment.",
121120
"Installer.dataScienceInstallPrompt": "Data Science library {0} is not installed. Install?",
122-
"diagnostics.removedPythonPathFromSettings": "We removed the \"python.pythonPath\" setting from your settings.json file as the setting is no longer used by the Python extension. You can get the path of your selected interpreter in the Python output channel. [Learn more](https://aka.ms/AA7jfor).",
121+
"diagnostics.removedPythonPathFromSettings": "The \"python.pythonPath\" setting in your settings.json is no longer used by the Python extension. If you want, you can use a new setting called \"python.defaultInterpreterPath\" instead. Keep in mind that you need to change the value of this setting manually as the Python extension doesn’t modify it when you change interpreters. [Learn more](https://aka.ms/AA7jfor).",
123122
"diagnostics.warnSourceMaps": "Source map support is enabled in the Python Extension, this will adversely impact performance of the extension.",
124123
"diagnostics.disableSourceMaps": "Disable Source Map Support",
125124
"diagnostics.warnBeforeEnablingSourceMaps": "Enabling source map support in the Python Extension will adversely impact performance of the extension.",

‎package.nls.zh-cn.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"python.command.python.switchToDailyChannel.title": "切换到每日预览版本",
1212
"python.command.python.switchToWeeklyChannel.title": "切换到每周预览版本",
1313
"python.command.python.clearWorkspaceInterpreter.title": "清除工作区解释器设置",
14-
"python.command.python.resetInterpreterSecurityStorage.title": "重置已存储的未受信任解释器的信息",
1514
"python.command.python.refactorExtractVariable.title": "提取变量",
1615
"python.command.python.refactorExtractMethod.title": "提取方法",
1716
"python.command.python.viewOutput.title": "显示输出",
@@ -54,7 +53,6 @@
5453
"Interpreters.entireWorkspace": "完整工作区",
5554
"Interpreters.pythonInterpreterPath": "Python 解释器路径: {0}",
5655
"Interpreters.LoadingInterpreters": "正在加载 Python 解释器",
57-
"Interpreters.unsafeInterpreterMessage": "此工作区中有一个 Python 环境，是否启用它来激活扩展中的功能？请在信任此环境时启用。",
5856
"Interpreters.condaInheritEnvMessage": "您正在使用 conda 环境，如果您在集成终端中遇到相关问题，建议您允许 Python 扩展将用户设置中的 \"terminal.integrated.inheritEnv\" 改为 false。",
5957
"Logging.CurrentWorkingDirectory": "cwd:",
6058
"InterpreterQuickPickList.quickPickListPlaceholder": "当前: {0}",
@@ -108,7 +106,6 @@
108106
"Installer.searchForHelp": "搜索帮助",
109107
"Installer.couldNotInstallLibrary": "无法安装 {0} 。如果 pip 不可用，请使用选择的包管理器手动将此库安装到您的 Python 环境中。",
110108
"Installer.dataScienceInstallPrompt": "数据科学库 {0} 未安装，是否安装？",
111-
"diagnostics.removedPythonPathFromSettings": "已在 settings.json 文件中删除了 \"python.pythonPath\" ，因为 Python 扩展不再使用该设置。您可以在 Python 输出中获取所选解释器的路径。[了解更多](https://aka.ms/AA7jfor).",
112109
"diagnostics.warnSourceMaps": "已启用 Source Map 支持，这会影响 Python 扩展的性能。",
113110
"diagnostics.disableSourceMaps": "禁用 Source Map 支持",
114111
"diagnostics.warnBeforeEnablingSourceMaps": "启用 Source Map 支持将影响 Python 扩展的性能。",

‎pythonFiles/pyvsc-run-isolated.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)