From 72a893be95463afdaf422c040b72db2e413d196a Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Tue, 12 Jun 2018 17:11:22 +0200 Subject: [PATCH 1/3] Document Pyhton native build dependency Change-Type: patch --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index b86379cc3..c21a7a44d 100644 --- a/README.md +++ b/README.md @@ -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 From 398c34d842d1b5895b794e9da8da51d0972d8304 Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Tue, 12 Jun 2018 17:43:15 +0200 Subject: [PATCH 2/3] Includes new prettier changes, and pin prettier to stop more appearing --- lib/utils/helpers.ts | 3 +-- package.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/utils/helpers.ts b/lib/utils/helpers.ts index e05757751..4f3d0d951 100644 --- a/lib/utils/helpers.ts +++ b/lib/utils/helpers.ts @@ -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() diff --git a/package.json b/package.json index b0e8de0fa..2f1ca1112 100644 --- a/package.json +++ b/package.json @@ -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", From f6822f150263f5b66396847abf79de67d185c7a1 Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Tue, 12 Jun 2018 18:26:12 +0000 Subject: [PATCH 3/3] v7.5.2 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb4e4726a..a7e957ea4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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] diff --git a/package.json b/package.json index 2f1ca1112..dcc57d9bb 100644 --- a/package.json +++ b/package.json @@ -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",