Skip to content

Commit f7ab79f

Browse files
committed
Merge branch 'master' into support-6.0rc1-build-image
2 parents 3153db8 + f5dbf2c commit f7ab79f

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

.travis.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ language: python
22
python:
33
- 3.6
44
dist: xenial
5+
6+
env:
7+
global:
8+
- NODE_VERSION=10.17.0
9+
510
matrix:
611
include:
712
- python: 3.6
@@ -27,8 +32,8 @@ install:
2732
- pip install tox-travis
2833
- curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
2934
- source ~/.nvm/nvm.sh
30-
- nvm install --lts
31-
- nvm use --lts
35+
- nvm install $NODE_VERSION
36+
- nvm use $NODE_VERSION
3237
- npm install -g bower
3338
- npm install
3439
- bower install

docs/development/front-end.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ in.
5555
Getting Started
5656
---------------
5757

58-
You will need a working version of Node and NPM to get started. We won't cover
59-
that here, as it varies from platform to platform.
58+
You will need a working version of Node (tested with ``v10.17.0``) and NPM to get started.
59+
We won't cover that here, as it varies from platform to platform.
6060

6161
To install these tools and dependencies::
6262

docs/development/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,4 @@ see :doc:`buildenvironments`.
183183
For building this documentation,
184184
see :doc:`docs`.
185185

186-
And for setting up for the front end development, see :doc:`standards`.
186+
And for setting up for the front end development, see :doc:`front-end`.

tox.ini

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ commands =
5454
--die-on-tool-error {posargs}
5555
5656
[testenv:eslint]
57+
whitelist_externals = npm
5758
description = run the JavaScript linter (requires `npm install`)
5859
commands =
5960
npm run lint

0 commit comments

Comments
 (0)