Skip to content

Commit

Permalink
Testing conda env
Browse files Browse the repository at this point in the history
  • Loading branch information
Kartik Raj committed Dec 18, 2018
1 parent ddb2caf commit e351f1f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 16 deletions.
24 changes: 12 additions & 12 deletions build/ci/templates/compile-and-validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,24 +121,24 @@ jobs:
condition: and(succeeded(), eq(variables['runHygiene'], 'true'))


- task: Npm@1
displayName: 'run cover:enable'
inputs:
command: custom
# - task: Npm@1
# displayName: 'run cover:enable'
# inputs:
# command: custom

verbose: false
# verbose: false

customCommand: 'run cover:enable'
# customCommand: 'run cover:enable'


- task: Npm@1
displayName: 'run test:unittests'
inputs:
command: custom
# - task: Npm@1
# displayName: 'run test:unittests'
# inputs:
# command: custom

verbose: false
# verbose: false

customCommand: 'run test:unittests:cover'
# customCommand: 'run test:unittests:cover'


- bash: 'bash <(curl -s https://codecov.io/bash) -t $(COV_UUID)'
Expand Down
16 changes: 12 additions & 4 deletions src/client/interpreter/locators/services/condaService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ export class CondaService implements ICondaService {
}
// tslint:disable-next-line:no-unnecessary-local-variable
const condaFile = await this.condaFile!;
// tslint:disable-next-line:no-console
console.log('condaFile ', condaFile);
return condaFile!;
}

Expand Down Expand Up @@ -435,17 +437,21 @@ export class CondaService implements ICondaService {
* Return the path to the "conda file", if there is one (in known locations).
*/
private async getCondaFileImpl() {
// tslint:disable-next-line:no-console
console.log('In getCondaFileImpl()');
const settings = this.configService.getSettings();

const setting = settings.condaPath;
if (setting && setting !== '') {
return setting;
}

const isAvailable = await this.isCondaInCurrentPath();
if (isAvailable) {
return 'conda';
}
// const isAvailable = await this.isCondaInCurrentPath();
// if (isAvailable) {
// // tslint:disable-next-line:no-console
// console.log('We found conda in current path');
// return 'conda';
// }
if (this.platform.isWindows && this.registryLookupForConda) {
const interpreters = await this.registryLookupForConda.getInterpreters();
const condaInterpreters = interpreters.filter(this.detectCondaEnvironment);
Expand All @@ -463,6 +469,8 @@ export class CondaService implements ICondaService {
* Note: For now we simply return the first one found.
*/
private async getCondaFileFromKnownLocations(): Promise<string> {
// tslint:disable-next-line:no-console
console.log('Inside getCondaFileFromKnownLocations');
const globPattern = this.platform.isWindows ? CondaLocationsGlobWin : CondaLocationsGlob;
const condaFiles = await this.fileSystem.search(globPattern)
.catch<string[]>((failReason) => {
Expand Down

0 comments on commit e351f1f

Please sign in to comment.