Append --pre to black installation command when pipenv is used (microsoft#5393)

erinxocon · DonJayamanne · commit 6dbd8b6859c8 · 2019-04-25T10:35:02.000-07:00
* if black is being installed, append pre 
This is so it can be resolved correctly by pipenv
* extra extra read all about it!
update news
* if black is being installed make sure we pass --pre
* Thank author of PR
diff --git a/news/2 Fixes/5171.md b/news/2 Fixes/5171.md
@@ -0,0 +1,2 @@
+Append `--pre` to black installation command so pipenv can properly resolve it.
+(thanks [Erin O'Connell](https://github.com/erinxocon))
diff --git a/src/client/common/installer/pipEnvInstaller.ts b/src/client/common/installer/pipEnvInstaller.ts
@@ -31,8 +31,12 @@ export class PipEnvInstaller extends ModuleInstaller implements IModuleInstaller
         return interpreters && interpreters.length > 0;
     }
     protected async getExecutionInfo(moduleName: string, _resource?: Uri): Promise<ExecutionInfo> {
+        const args = ['install', moduleName, '--dev'];
+        if (moduleName === 'black') {
+            args.push('--pre');
+        };
         return {
-            args: ['install', moduleName, '--dev'],
+            args: args,
             execPath: pipenvName
         };
     }
diff --git a/src/test/common/installer/moduleInstaller.unit.test.ts b/src/test/common/installer/moduleInstaller.unit.test.ts
@@ -217,6 +217,9 @@ suite('Module Installer', () => {
                                 test(`Test args (${product.name})`, async () => {
                                     setActiveInterpreter();
                                     const expectedArgs = ['install', moduleName, '--dev'];
+                                    if (moduleName === 'black') {
+                                        expectedArgs.push('--pre')
+                                    }
                                     await installModuleAndVerifyCommand(pipenvName, expectedArgs);
                                 });
                             }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Append `--pre` to black installation command so pipenv can properly resolve it.
	`2`	`+(thanks [Erin O'Connell](https://github.com/erinxocon))`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,12 @@ export class PipEnvInstaller extends ModuleInstaller implements IModuleInstaller`
`31`	`31`	`return interpreters && interpreters.length > 0;`
`32`	`32`	`}`
`33`	`33`	`protected async getExecutionInfo(moduleName: string, _resource?: Uri): Promise<ExecutionInfo> {`
	`34`	`+ const args = ['install', moduleName, '--dev'];`
	`35`	`+ if (moduleName === 'black') {`
	`36`	`+ args.push('--pre');`
	`37`	`+ };`
`34`	`38`	`return {`
`35`		`- args: ['install', moduleName, '--dev'],`
	`39`	`+ args: args,`
`36`	`40`	`execPath: pipenvName`
`37`	`41`	`};`
`38`	`42`	`}`