Skip to content

Merge release in master #2749

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
merged 10 commits into from
Apr 28, 2017
Merged

Merge release in master #2749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a9afa64
Fix debug on iOS simulator with watch (#2721)
rosen-vladimirov Apr 19, 2017
6ad0cef
Implement extensibility model for CLI (#2724)
rosen-vladimirov Apr 21, 2017
53e56f5
Fix installation scripts for Mac (#2714)
etabakov Apr 21, 2017
e654156
Do not start emulator when `--available-devices` is passed (#2736)
rosen-vladimirov Apr 25, 2017
67bb17e
Install karma peer dependencies on `test init` (#2693)
petekanev Apr 25, 2017
d95e9eb
Freeze mocha-typescript to 1.0.23 (#2746)
PanayotCankov Apr 27, 2017
9895dde
Freeze mocha-typescript to 1.0.23 (#2746)
PanayotCankov Apr 27, 2017
27b6d60
Fix the six package detection in release (#2748)
yyosifov Apr 27, 2017
5af9b00
Merge remote-tracking branch 'origin/release' into vladimirov/merge-r…
rosen-vladimirov Apr 27, 2017
7c83bca
Merge remote-tracking branch 'origin/release' into vladimirov/merge-r…
rosen-vladimirov Apr 27, 2017
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
2 changes: 1 addition & 1 deletion lib/node-package-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class NodePackageManager implements INodePackageManager {
throw err;
}
}
}
}

@exported("npm")
public async uninstall(packageName: string, config?: any, path?: string): Promise<string> {
Expand Down
15 changes: 8 additions & 7 deletions lib/services/doctor-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,18 @@ class DoctorService implements IDoctorService {
let hasInvalidPackages = false;
if (this.$hostInfo.isDarwin) {
try {
let queryForSixPackage = await this.$childProcess.exec(`pip freeze | grep '^six=' | wc -l`);
let sixPackagesFoundCount = parseInt(queryForSixPackage);
if (sixPackagesFoundCount === 0) {
await this.$childProcess.exec(`python -c "import six"`);
} catch (error) {
// error.code = 1 so the Python is present, but we don't have six.
if (error.code === 1) {
hasInvalidPackages = true;
this.$logger.warn("The Python 'six' package not found.");
this.$logger.out("This package is required by the Debugger library (LLDB) for iOS. You can install it by running 'pip install six' from the terminal.");
} else {
this.$logger.warn("Couldn't retrieve installed python packages.");
this.$logger.out("We cannot verify your python installation is setup correctly. Please, make sure you have both 'python' and 'pip' installed.");
this.$logger.trace(`Error while validating Python packages. Error is: ${error.message}`);
}
} catch (error) {
this.$logger.warn("Couldn't retrieve installed python packages.");
this.$logger.out("We cannot verify your python installation is setup correctly. Please, make sure you have both 'python' and 'pip' installed.");
this.$logger.trace(`Error while validating Python packages. Error is: ${error.message}`);
}
}
return hasInvalidPackages;
Expand Down