Append --allow-prereleases to black installation command when Poetry is used (#5967)

notpushkin · kimadeline · commit 16899f6b1347 · 2019-06-20T08:48:51.000-07:00
* if black is being installed, append --allow-prereleases, fixes #5756 * update news * add unit test for installing black with poetry
diff --git a/news/2 Fixes/5756.md b/news/2 Fixes/5756.md
@@ -0,0 +1 @@
+Append `--allow-prereleases` to black installation command so pipenv can properly resolve it.
diff --git a/src/client/common/installer/poetryInstaller.ts b/src/client/common/installer/poetryInstaller.ts
@@ -60,8 +60,12 @@ export class PoetryInstaller extends ModuleInstaller implements IModuleInstaller
     }
     protected async getExecutionInfo(moduleName: string, resource?: Uri): Promise<ExecutionInfo> {
         const execPath = this.configurationService.getSettings(resource).poetryPath;
+        const args = ['add', '--dev', moduleName];
+        if (moduleName === 'black') {
+            args.push('--allow-prereleases');
+        }
         return {
-            args: ['add', '--dev', moduleName],
+            args,
             execPath
         };
     }
diff --git a/src/test/common/installer/poetryInstaller.unit.test.ts b/src/test/common/installer/poetryInstaller.unit.test.ts
@@ -122,4 +122,15 @@ suite('Module Installer - Poetry', () => {
 
         assert.deepEqual(info, { args: ['add', '--dev', 'something'], execPath: 'poetry path' });
     });
+    test('Get executable info when installing black', async () => {
+        const uri = Uri.file(__dirname);
+        const settings = mock(PythonSettings);
+
+        when(configurationService.getSettings(uri)).thenReturn(instance(settings));
+        when(settings.poetryPath).thenReturn('poetry path');
+
+        const info = await poetryInstaller.getExecutionInfo('black', uri);
+
+        assert.deepEqual(info, { args: ['add', '--dev', 'black', '--allow-prereleases'], execPath: 'poetry path' });
+    });
 });

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Append `--allow-prereleases` to black installation command so pipenv can properly resolve it.
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,12 @@ export class PoetryInstaller extends ModuleInstaller implements IModuleInstaller`
`60`	`60`	`}`
`61`	`61`	`protected async getExecutionInfo(moduleName: string, resource?: Uri): Promise<ExecutionInfo> {`
`62`	`62`	`const execPath = this.configurationService.getSettings(resource).poetryPath;`
	`63`	`+ const args = ['add', '--dev', moduleName];`
	`64`	`+ if (moduleName === 'black') {`
	`65`	`+ args.push('--allow-prereleases');`
	`66`	`+ }`
`63`	`67`	`return {`
`64`		`- args: ['add', '--dev', moduleName],`
	`68`	`+ args,`
`65`	`69`	`execPath`
`66`	`70`	`};`
`67`	`71`	`}`