From 91398e749a15dd86abc8ed6b57f99a17f4f7e6d5 Mon Sep 17 00:00:00 2001 From: cclauss Date: Thu, 3 Oct 2019 17:51:23 +0200 Subject: [PATCH 1/2] v5.x: Add Python 3.5 and 3.6 tests on Linux --- .travis.yml | 8 ++++++++ README.md | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f27f024f2d..ac0195549f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,14 @@ matrix: python: 3.7 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1 before_install: nvm install 10 + - name: "Node.js 12 & Python 3.5 on Linux" + python: 3.5 + env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1 + before_install: nvm install 12 + - name: "Node.js 12 & Python 3.6 on Linux" + python: 3.6 + env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1 + before_install: nvm install 12 - name: "Node.js 12 & Python 3.7 on Linux" python: 3.7 env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1 diff --git a/README.md b/README.md index 0c76ffc09b..5529e62c76 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ You will also need to install: ### On Unix - * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported) + * `python v2.7, v3.5, v3.6, or v3.7` * `make` * A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org) ### On macOS - * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported) (already installed on macOS) + * `python v2.7, v3.5, v3.6, or v3.7` * [Xcode](https://developer.apple.com/xcode/download/) * You also need to install the `XCode Command Line Tools` by running `xcode-select --install`. Alternatively, if you already have the full Xcode installed, you can find them under the menu `Xcode -> Open Developer Tool -> More Developer Tools...`. This step will install `clang`, `clang++`, and `make`. @@ -62,7 +62,7 @@ If you have multiple Python versions installed, you can identify which Python version `node-gyp` uses by setting the `--python` variable: ``` bash -$ node-gyp --python /path/to/executable/python2.7 +$ node-gyp --python /path/to/executable/python ``` If `node-gyp` is called by way of `npm`, *and* you have multiple versions of @@ -70,7 +70,7 @@ Python installed, then you can set `npm`'s 'python' config key to the appropriat value: ``` bash -$ npm config set python /path/to/executable/python2.7 +$ npm config set python /path/to/executable/python ``` ## How to Use From c05221879f575e07aa7671abd5dcd6aed53134a8 Mon Sep 17 00:00:00 2001 From: cclauss Date: Thu, 3 Oct 2019 18:59:02 +0200 Subject: [PATCH 2/2] Revert changes to README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5529e62c76..0c76ffc09b 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ You will also need to install: ### On Unix - * `python v2.7, v3.5, v3.6, or v3.7` + * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported) * `make` * A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org) ### On macOS - * `python v2.7, v3.5, v3.6, or v3.7` + * `python` (`v2.7` recommended, `v3.x.x` is __*not*__ supported) (already installed on macOS) * [Xcode](https://developer.apple.com/xcode/download/) * You also need to install the `XCode Command Line Tools` by running `xcode-select --install`. Alternatively, if you already have the full Xcode installed, you can find them under the menu `Xcode -> Open Developer Tool -> More Developer Tools...`. This step will install `clang`, `clang++`, and `make`. @@ -62,7 +62,7 @@ If you have multiple Python versions installed, you can identify which Python version `node-gyp` uses by setting the `--python` variable: ``` bash -$ node-gyp --python /path/to/executable/python +$ node-gyp --python /path/to/executable/python2.7 ``` If `node-gyp` is called by way of `npm`, *and* you have multiple versions of @@ -70,7 +70,7 @@ Python installed, then you can set `npm`'s 'python' config key to the appropriat value: ``` bash -$ npm config set python /path/to/executable/python +$ npm config set python /path/to/executable/python2.7 ``` ## How to Use