Revert addition of PyStein "feature flag" setting. (#3386)

microsoft · Oct 25, 2022 · 1ae3bce · 1ae3bce
1 parent 4ac119c
commit 1ae3bce
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -1032,12 +1032,6 @@
                         "scope": "resource",
                         "type": "string",
                         "description": "%azureFunctions.funcCliPath%"
-                    },
-                    "azureFunctions.showPysteinModel": {
-                        "scope": "resource",
-                        "type": "boolean",
-                        "default": false,
-                        "description": "%azureFunctions.showPysteinModel%"
                     }
                 }
             }

diff --git a/package.nls.json b/package.nls.json
@@ -100,6 +100,5 @@
     "azureFunctions.validateFuncCoreTools": "Validate the Azure Functions Core Tools is installed before debugging.",
     "azureFunctions.viewCommitInGitHub": "View Commit in GitHub",
     "azureFunctions.viewDeploymentLogs": "View Deployment Logs",
-    "azureFunctions.viewProperties": "View Properties",
-    "azureFunctions.showPysteinModel": "Enable Python (New Model Preview)"
+    "azureFunctions.viewProperties": "View Properties"
 }
diff --git a/src/commands/createNewProject/NewProjectLanguageStep.ts b/src/commands/createNewProject/NewProjectLanguageStep.ts
@@ -5,12 +5,11 @@
 
 import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions, UserCancelledError } from '@microsoft/vscode-azext-utils';
 import { QuickPickOptions } from 'vscode';
-import { previewPythonModel, ProjectLanguage, pysteinModelSetting, pythonNewModelPreview } from '../../constants';
+import { previewPythonModel, ProjectLanguage, pythonNewModelPreview } from '../../constants';
 import { localize } from '../../localize';
 import { nonNullProp } from '../../utils/nonNull';
 import { openUrl } from '../../utils/openUrl';
 import { isPythonV2Plus } from '../../utils/pythonUtils';
-import { getWorkspaceSetting } from '../../vsCodeConfig/settings';
 import { FunctionListStep } from '../createFunction/FunctionListStep';
 import { addInitVSCodeSteps } from '../initProjectForVSCode/InitVSCodeLanguageStep';
 import { DotnetRuntimeStep } from './dotnetSteps/DotnetRuntimeStep';
@@ -58,12 +57,6 @@ export class NewProjectLanguageStep extends AzureWizardPromptStep<IProjectWizard
             });
         }
 
-        if (!getWorkspaceSetting(pysteinModelSetting)) {
-            languagePicks = languagePicks.filter(p => {
-                return p.label !== pythonNewModelPreview;
-            })
-        }
-
         const options: QuickPickOptions = { placeHolder: localize('selectLanguage', 'Select a language') };
         const result = (await context.ui.showQuickPick(languagePicks, options)).data;
         if (result === undefined) {

diff --git a/src/commands/initProjectForVSCode/InitVSCodeLanguageStep.ts b/src/commands/initProjectForVSCode/InitVSCodeLanguageStep.ts
@@ -5,9 +5,8 @@
 
 import { AzureWizardExecuteStep, AzureWizardPromptStep, IAzureQuickPickItem, IWizardOptions } from '@microsoft/vscode-azext-utils';
 import { QuickPickOptions } from 'vscode';
-import { previewPythonModel, ProjectLanguage, pysteinModelSetting, pythonNewModelPreview } from '../../constants';
+import { previewPythonModel, ProjectLanguage, pythonNewModelPreview } from '../../constants';
 import { localize } from '../../localize';
-import { getWorkspaceSetting } from '../../vsCodeConfig/settings';
 import { IProjectWizardContext } from '../createNewProject/IProjectWizardContext';
 import { DotnetInitVSCodeStep } from './InitVSCodeStep/DotnetInitVSCodeStep';
 import { DotnetScriptInitVSCodeStep } from './InitVSCodeStep/DotnetScriptInitVSCodeStep';
@@ -23,7 +22,7 @@ export class InitVSCodeLanguageStep extends AzureWizardPromptStep<IProjectWizard
 
     public async prompt(context: IProjectWizardContext): Promise<void> {
         // Display all languages, even if we don't have full support for them
-        let languagePicks: IAzureQuickPickItem<{ language: ProjectLanguage, model?: number }>[] = [
+        const languagePicks: IAzureQuickPickItem<{ language: ProjectLanguage, model?: number }>[] = [
             { label: ProjectLanguage.CSharp, data: { language: ProjectLanguage.CSharp } },
             { label: ProjectLanguage.CSharpScript, data: { language: ProjectLanguage.CSharpScript } },
             { label: ProjectLanguage.FSharp, data: { language: ProjectLanguage.FSharp } },
@@ -37,12 +36,6 @@ export class InitVSCodeLanguageStep extends AzureWizardPromptStep<IProjectWizard
             { label: ProjectLanguage.Custom, data: { language: ProjectLanguage.Custom } }
         ];
 
-        if (!getWorkspaceSetting(pysteinModelSetting)) {
-            languagePicks = languagePicks.filter(p => {
-                return p.label !== pythonNewModelPreview;
-            })
-        }
-
         const options: QuickPickOptions = { placeHolder: localize('selectLanguage', "Select your project's language") };
         const option = await context.ui.showQuickPick(languagePicks, options);
         context.language = option.data.language;

diff --git a/src/constants.ts b/src/constants.ts
@@ -20,7 +20,6 @@ export const hiddenStacksSetting: string = 'showHiddenStacks';
 export const projectTemplateKeySetting: string = 'projectTemplateKey';
 export const remoteBuildSetting: string = 'scmDoBuildDuringDeployment';
 export const javaBuildTool: string = 'javaBuildTool';
-export const pysteinModelSetting: string = "showPysteinModel";
 
 export enum ProjectLanguage {
     CSharp = 'C#',