mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-18 11:55:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enforce npm dedupe

Browse Source
This commit is contained in:
Steven Silvester 2016-04-19 08:13:14 -05:00
parent 89f942029d
commit b30e35a8a1
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
setupbase.py
View File

@ -19,6 +19,7 @@ import sys
import pipes import pipes
from distutils import log from distutils import log
from distutils.cmd import Command from distutils.cmd import Command
from distutils.version import LooseVersion
from fnmatch import fnmatch from fnmatch import fnmatch
from glob import glob from glob import glob
from multiprocessing.pool import ThreadPool from multiprocessing.pool import ThreadPool
@ -333,6 +334,23 @@ def run(cmd, *args, **kwargs):
return check_call(cmd, *args, **kwargs) return check_call(cmd, *args, **kwargs)
def npm_install(cwd):
"""Run npm install in a directory and dedupe if necessary"""
try:
run(['npm', 'install', '--progress=false'], cwd=cwd)
except OSError as e:
print("Failed to run `npm install`: %s" % e, file=sys.stderr)
print("npm is required to build a development version of the notebook.", file=sys.stderr)
raise
version = check_output('npm --version', shell=True).decode('utf-8')
if LooseVersion(version) < LooseVersion('3.0'):
try:
run(['npm', 'dedupe'], cwd=cwd)
except Exception as e:
print("Failed to run `npm dedupe`: %s" % e, file=sys.stderr)
print("Please install npm v3+ to build a development version of the notebook.")
class JavascriptDependencies(Command): class JavascriptDependencies(Command):
description = "Fetch Javascript dependencies with npm and bower" description = "Fetch Javascript dependencies with npm and bower"
@ -347,13 +365,8 @@ class JavascriptDependencies(Command):
lab_dir = pjoin(repo_root, 'notebook', 'lab') lab_dir = pjoin(repo_root, 'notebook', 'lab')
def run(self): def run(self):
try: npm_install(repo_root)
run(['npm', 'install', '--progress=false'], cwd=repo_root)
except OSError as e:
print("Failed to run `npm install`: %s" % e, file=sys.stderr)
print("npm is required to build a development version of the notebook.", file=sys.stderr)
raise
try: try:
run(['npm', 'run', 'bower'], cwd=repo_root) run(['npm', 'run', 'bower'], cwd=repo_root)
except Exception as e: except Exception as e:
@ -362,7 +375,7 @@ class JavascriptDependencies(Command):
raise raise
try: try:
run(['npm', 'install', '--progress=false'], cwd=self.lab_dir) npm_install(self.lab_dir)
run(['npm', 'run', 'build'], cwd=self.lab_dir) run(['npm', 'run', 'build'], cwd=self.lab_dir)
except Exception as e: except Exception as e:
print("Failed to install JupyterLab`: %s" % e, file=sys.stderr) print("Failed to install JupyterLab`: %s" % e, file=sys.stderr)