Require npm@7 and nodejs 14.* (#10674)

* Require npm@7 to support lock files v2 * Use `npm install -g npm@7` * Require nodejs 14.* for dev/CI * Use nodejs 14.* in CI envs * Update lock files in examples/tests
bokeh · Nov 15, 2020 · 3bf3636 · 3bf3636
1 parent ce97a3f
commit 3bf3636
Show file tree

Hide file tree

Showing 16 changed files with 966 additions and 3,498 deletions.
diff --git a/.github/workflows/bokehjs-ci.yml b/.github/workflows/bokehjs-ci.yml
@@ -20,7 +20,7 @@ jobs:
       max-parallel: 3
       matrix:
         os: [ubuntu-20.04, macos-latest, windows-latest]
-        node-version: [12.x]
+        node-version: [14.x]
 
     steps:
       - name: Checkout the repository
@@ -34,7 +34,7 @@ jobs:
       - name: Upgrade npm
         shell: bash
         run: |
-          npm install -g npm
+          npm install -g npm@7
 
       - name: Install dependencies
         working-directory: ./bokehjs

diff --git a/bokehjs/package-lock.json b/bokehjs/package-lock.json
diff --git a/bokehjs/package.json b/bokehjs/package.json
@@ -17,8 +17,8 @@
     "url": "https://github.com/bokeh/bokeh.git"
   },
   "engines": {
-    "node": ">=12.12",
-    "npm": ">=6.14"
+    "node": ">=14",
+    "npm": ">=7"
   },
   "files": [
     "build/js/bokeh*.min.js",

diff --git a/ci/environment-build.yml b/ci/environment-build.yml
@@ -5,7 +5,7 @@ dependencies:
   - python=3.6
   - conda-build=3.18.10
   - conda-verify=3.4.2
-  - nodejs>=10.13
+  - nodejs 14.*
   - ripgrep=0.10.0
   - setuptools
   - yaml
diff --git a/ci/environment-release-build.yml b/ci/environment-release-build.yml
@@ -19,7 +19,7 @@ dependencies:
   - colorama
   - conda-build=3.20.5
   - conda-verify=3.4.2
-  - nodejs>=10.13
+  - nodejs 14.*
   - ripgrep=0.10.0
   - setuptools
   - yaml

diff --git a/ci/environment-release-deploy.yml b/ci/environment-release-deploy.yml
@@ -8,7 +8,7 @@ dependencies:
   - anaconda-client
   - boto
   - colorama
-  - nodejs>=10.13
+  - nodejs 14.*
   - setuptools
   - twine
   - yaml
diff --git a/ci/environment-test-3.6.yml b/ci/environment-test-3.6.yml
@@ -33,7 +33,7 @@ dependencies:
   - mypy <=0.782
   - nbconvert >=5.4
   - networkx
-  - nodejs >=12.12
+  - nodejs 14.*
   - numba
   - pandas
   - psutil

diff --git a/ci/environment-test-3.7.yml b/ci/environment-test-3.7.yml
@@ -33,7 +33,7 @@ dependencies:
   - mypy <=0.782
   - nbconvert >=5.4
   - networkx
-  - nodejs >=12.12
+  - nodejs 14.*
   - numba
   - pandas
   - psutil

diff --git a/ci/environment-test-3.8.yml b/ci/environment-test-3.8.yml
@@ -33,7 +33,7 @@ dependencies:
   - mypy <=0.782
   - nbconvert >=5.4
   - networkx
-  - nodejs >=12.12
+  - nodejs 14.*
   - numba
   - pandas
   - psutil

diff --git a/ci/install_node_modules.sh b/ci/install_node_modules.sh
@@ -3,7 +3,7 @@
 set -x #echo on
 
 pushd bokehjs
-npm install -g npm
+npm install -g npm@7
 npm ci --no-progress
 node make examples --no-build
 popd
diff --git a/docker-tools/alpine/Dockerfile-from-source b/docker-tools/alpine/Dockerfile-from-source
@@ -35,7 +35,7 @@ RUN conda config --get channels
 # install build time dependencies
 RUN conda install --yes --quiet `python scripts/deps.py build`
 # install NPM dependencies
-RUN npm install -g npm
+RUN npm install -g npm@7
 WORKDIR $BOKEH_SOURCE_DIR/bokehjs
 # build BokehJS
 RUN npm ci --no-progress