Skip to content

Commit 1ae3bce

Browse files
authored
Revert addition of PyStein "feature flag" setting. (#3386)
1 parent 4ac119c commit 1ae3bce

5 files changed

Lines changed: 4 additions & 26 deletions

File tree

package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,12 +1032,6 @@
10321032
"scope": "resource",
10331033
"type": "string",
10341034
"description": "%azureFunctions.funcCliPath%"
1035-
},
1036-
"azureFunctions.showPysteinModel": {
1037-
"scope": "resource",
1038-
"type": "boolean",
1039-
"default": false,
1040-
"description": "%azureFunctions.showPysteinModel%"
10411035
}
10421036
}
10431037
}

package.nls.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,5 @@
100100
"azureFunctions.validateFuncCoreTools": "Validate the Azure Functions Core Tools is installed before debugging.",
101101
"azureFunctions.viewCommitInGitHub": "View Commit in GitHub",
102102
"azureFunctions.viewDeploymentLogs": "View Deployment Logs",
103-
"azureFunctions.viewProperties": "View Properties",
104-
"azureFunctions.showPysteinModel": "Enable Python (New Model Preview)"
103+
"azureFunctions.viewProperties": "View Properties"
105104
}

src/commands/createNewProject/NewProjectLanguageStep.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55

66
import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions, UserCancelledError } from '@microsoft/vscode-azext-utils';
77
import { QuickPickOptions } from 'vscode';
8-
import { previewPythonModel, ProjectLanguage, pysteinModelSetting, pythonNewModelPreview } from '../../constants';
8+
import { previewPythonModel, ProjectLanguage, pythonNewModelPreview } from '../../constants';
99
import { localize } from '../../localize';
1010
import { nonNullProp } from '../../utils/nonNull';
1111
import { openUrl } from '../../utils/openUrl';
1212
import { isPythonV2Plus } from '../../utils/pythonUtils';
13-
import { getWorkspaceSetting } from '../../vsCodeConfig/settings';
1413
import { FunctionListStep } from '../createFunction/FunctionListStep';
1514
import { addInitVSCodeSteps } from '../initProjectForVSCode/InitVSCodeLanguageStep';
1615
import { DotnetRuntimeStep } from './dotnetSteps/DotnetRuntimeStep';
@@ -58,12 +57,6 @@ export class NewProjectLanguageStep extends AzureWizardPromptStep<IProjectWizard
5857
});
5958
}
6059

61-
if (!getWorkspaceSetting(pysteinModelSetting)) {
62-
languagePicks = languagePicks.filter(p => {
63-
return p.label !== pythonNewModelPreview;
64-
})
65-
}
66-
6760
const options: QuickPickOptions = { placeHolder: localize('selectLanguage', 'Select a language') };
6861
const result = (await context.ui.showQuickPick(languagePicks, options)).data;
6962
if (result === undefined) {

src/commands/initProjectForVSCode/InitVSCodeLanguageStep.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from '@microsoft/vscode-azext-utils';
77
import { QuickPickOptions } from 'vscode';
8-
import { previewPythonModel, ProjectLanguage, pysteinModelSetting, pythonNewModelPreview } from '../../constants';
8+
import { previewPythonModel, ProjectLanguage, pythonNewModelPreview } from '../../constants';
99
import { localize } from '../../localize';
10-
import { getWorkspaceSetting } from '../../vsCodeConfig/settings';
1110
import { IProjectWizardContext } from '../createNewProject/IProjectWizardContext';
1211
import { DotnetInitVSCodeStep } from './InitVSCodeStep/DotnetInitVSCodeStep';
1312
import { DotnetScriptInitVSCodeStep } from './InitVSCodeStep/DotnetScriptInitVSCodeStep';
@@ -23,7 +22,7 @@ export class InitVSCodeLanguageStep extends AzureWizardPromptStep<IProjectWizard
2322

2423
public async prompt(context: IProjectWizardContext): Promise<void> {
2524
// Display all languages, even if we don't have full support for them
26-
let languagePicks: IAzureQuickPickItem<{ language: ProjectLanguage, model?: number }>[] = [
25+
const languagePicks: IAzureQuickPickItem<{ language: ProjectLanguage, model?: number }>[] = [
2726
{ label: ProjectLanguage.CSharp, data: { language: ProjectLanguage.CSharp } },
2827
{ label: ProjectLanguage.CSharpScript, data: { language: ProjectLanguage.CSharpScript } },
2928
{ label: ProjectLanguage.FSharp, data: { language: ProjectLanguage.FSharp } },
@@ -37,12 +36,6 @@ export class InitVSCodeLanguageStep extends AzureWizardPromptStep<IProjectWizard
3736
{ label: ProjectLanguage.Custom, data: { language: ProjectLanguage.Custom } }
3837
];
3938

40-
if (!getWorkspaceSetting(pysteinModelSetting)) {
41-
languagePicks = languagePicks.filter(p => {
42-
return p.label !== pythonNewModelPreview;
43-
})
44-
}
45-
4639
const options: QuickPickOptions = { placeHolder: localize('selectLanguage', "Select your project's language") };
4740
const option = await context.ui.showQuickPick(languagePicks, options);
4841
context.language = option.data.language;

src/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export const hiddenStacksSetting: string = 'showHiddenStacks';
2020
export const projectTemplateKeySetting: string = 'projectTemplateKey';
2121
export const remoteBuildSetting: string = 'scmDoBuildDuringDeployment';
2222
export const javaBuildTool: string = 'javaBuildTool';
23-
export const pysteinModelSetting: string = "showPysteinModel";
2423

2524
export enum ProjectLanguage {
2625
CSharp = 'C#',

0 commit comments

Comments
 (0)