nodejs

stonebig · stonebig · commit 970c00ab846d · 2017-07-29T10:19:44.000+02:00
diff --git a/make.py b/make.py
@@ -96,6 +96,7 @@ class WinPythonDistribution(object):
     MINGW32_PATH = r'\tools\mingw32\bin'
     R_PATH = r'\tools\R\bin'
     JULIA_PATH = r'\tools\Julia\bin'
+    NODEJS_PATH = r'\tools\n'
 
     def __init__(self, build_number, release_level, target, wheeldir,
                  toolsdirs=None, verbose=False, simulation=False,
@@ -154,6 +155,11 @@ def get_tool_path(relpath, checkfunc):
             juliaver = utils.get_julia_version(juliapath)
             installed_tools += [('Julia', juliaver)]
 
+        nodepath = get_tool_path(self.NODEJS_PATH, osp.isdir)
+        if nodepath is not None:
+            nodever = utils.get_nodejs_version(nodepath)
+            installed_tools += [('Nodejs', nodever)]
+
         pandocexe = get_tool_path (r'\tools\pandoc.exe', osp.isfile)
         if pandocexe is not None:
             pandocver = utils.get_pandoc_version(osp.dirname(pandocexe))
@@ -243,6 +249,8 @@ def prepath(self):
 
         path += [r".." + self.JULIA_PATH]
 
+        path += [r".." + self.NODEJS_PATH]
+
         return path
 
     @property
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -562,6 +562,9 @@ description=Collection of low-level Python packages and modules used by Logilab
 [logutils]
 description=Logging utilities
 
+[loky]
+description=Robust and reusable Executor for joblib
+
 [lxml]
 description=Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
 
diff --git a/winpython/data/tools.ini b/winpython/data/tools.ini
@@ -29,3 +29,7 @@ url=http://tortoisehg.bitbucket.org
 [winmerge]
 description=Open Source differencing and merging tool for Windows
 url=http://winmerge.org
+
+[nodejs]
+description=a JavaScript runtime built on Chrome's V8 JavaScript engine
+url=https://nodejs.org
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -228,6 +228,9 @@ def get_julia_version(path):
     """Return version of the Julia installed in *path*"""
     return exec_shell_cmd('julia.exe -v', path).splitlines()[0].split(" ")[-1]
 
+def get_nodejs_version(path):
+    """Return version of the Nodejs installed in *path*"""
+    return exec_shell_cmd('npm version', path).split(" node: '")[1].split("'")[0]
 
 def get_thg_version(path):
     """Return version of TortoiseHg installed in *path*"""
