Skip to content

Commit

Permalink
Auto-merge for PR #893 via VersionBot
Browse files Browse the repository at this point in the history
Document Python native build dependency
  • Loading branch information
resin-io-versionbot[bot] committed Jun 12, 2018
2 parents 7b23b0e + f6822f1 commit bc86359
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/).

## v7.5.2 - 2018-06-12

* Document Pyhton native build dependency #893 [Tim Perry]

## v7.5.1 - 2018-06-01

* Add a multicontainer caveat to the env var commands #887 [Tim Perry]
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ $ npm install resin-cli -g --production --unsafe-perm
This allows npm install steps to download and save prebuilt native binaries. You may be able to omit it,
especially if you're using a user-managed node install such as [nvm](https://github.com/creationix/nvm).

In some environments, this process will need to build native modules. This may require a more complex build
environment, and notably requires Python 2.7. If you hit any problems with this, we recommend you try the
alternative standalone install below instead.

### Standalone install

If you don't have node or a working pre-gyp environment, you can still install the CLI as a standalone
Expand Down
3 changes: 1 addition & 2 deletions lib/utils/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ const resin = ResinSdk.fromSharedOptions();
export function getGroupDefaults(group: {
options: { name: string; default?: string }[];
}): { [name: string]: string | undefined } {
return _
.chain(group)
return _.chain(group)
.get('options')
.map(question => [question.name, question.default])
.fromPairs()
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "resin-cli",
"version": "7.5.1",
"version": "7.5.2",
"description": "The official resin.io CLI tool",
"main": "./build/actions/index.js",
"homepage": "https://github.com/resin-io/resin-cli",
Expand Down Expand Up @@ -79,7 +79,7 @@
"gulp-shell": "^0.5.2",
"mochainon": "^2.0.0",
"pkg": "^4.3.0-beta.1",
"prettier": "^1.9.2",
"prettier": "1.13.5",
"publish-release": "^1.3.3",
"require-npm4-to-publish": "^1.0.0",
"resin-lint": "^1.5.0",
Expand Down

0 comments on commit bc86359

Please sign in to comment.