Skip to content

Merge august release into master #6878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Don Jayamanne (DonJayamanne) merged 9 commits into from
Aug 7, 2019
Merged

Merge august release into master #6878

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2b774ab
Make dataviewers open faster (#6795)
rchiodo Jul 31, 2019
0961be7
Debug Mode Code lenses (#6792)
IanMatthewHuff Jul 31, 2019
52dcd3f
Merge pull request #6807 from IanMatthewHuff/release
IanMatthewHuff Aug 1, 2019
b15f9da
Cherry-pick miniconda fix into rc
rchiodo Aug 5, 2019
7d5e8c6
August Release (#6868)
DonJayamanne Aug 6, 2019
db6780c
Exclude .env file from extension (#6872)
DonJayamanne Aug 6, 2019
4e73d5b
Merge branch 'release' into mergeReleaseAugust
DonJayamanne Aug 6, 2019
ddd1e28
Update from master
DonJayamanne Aug 6, 2019
2826998
Update package lock
DonJayamanne Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cherry-pick miniconda fix into rc
  • Loading branch information
@rchiodo
rchiodo committed Aug 5, 2019
commit b15f9da34a0db53cc94dff18b8ae9b6e0627edf3
15 changes: 14 additions & 1 deletion src/client/interpreter/locators/services/condaService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,21 @@ export class CondaService implements ICondaService {
try {
const condaFile = await this.getCondaFile();
const processService = await this.processServiceFactory.create();
const envInfo = await processService.exec(condaFile, ['env', 'list']).then(output => output.stdout);
let envInfo = await processService.exec(condaFile, ['env', 'list']).then(output => output.stdout);
traceVerbose(`Conda Env List ${envInfo}}`);
if (!envInfo) {
traceVerbose('Conda env list failure, attempting path additions.');
// Try adding different folders to the path. Miniconda fails to run
// without them.
const baseFolder = path.dirname(path.dirname(condaFile));
const binFolder = path.join(baseFolder, 'bin');
const condaBinFolder = path.join(baseFolder, 'condabin');
const libaryBinFolder = path.join(baseFolder, 'library', 'bin');
const newEnv = process.env;
newEnv.PATH = `${binFolder};${condaBinFolder};${libaryBinFolder};${newEnv.PATH}`;
traceVerbose(`Attempting new path for conda env list: ${newEnv.PATH}`);
envInfo = await processService.exec(condaFile, ['env', 'list'], { env: newEnv }).then(output => output.stdout);
}
const environments = this.condaHelper.parseCondaEnvironmentNames(envInfo);
await globalPersistence.updateValue({ data: environments });
return environments;
Expand Down