8000 Merge pull request #552 from stonebig/master · winpython/winpython@632fe9a · GitHub
[go: up one dir, main page]
Skip to content

Commit 632fe9a

Browse files
stonebigstonebig
authored
Merge pull request #552 from stonebig/master
nodejs
2 parents 493e1f7 + 970c00a commit 632fe9a

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

‎make.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ class WinPythonDistribution(object):
9696
MINGW32_PATH = r'\tools\mingw32\bin'
9797
R_PATH = r'\tools\R\bin'
9898
JULIA_PATH = r'\tools\Julia\bin'
99+
NODEJS_PATH = r'\tools\n'
99100

100101
def __init__(self, build_number, release_level, target, wheeldir,
101102
toolsdirs=None, verbose=False, simulation=False,
@@ -154,6 +155,11 @@ def get_tool_path(relpath, checkfunc):
154155
juliaver = utils.get_julia_version(juliapath)
155156
installed_tools += [('Julia', juliaver)]
156157

158+
nodepath = get_tool_path(self.NODEJS_PATH, osp.isdir)
159+
if nodepath is not None:
160+
nodever = utils.get_nodejs_version(nodepath)
161+
installed_tools += [('Nodejs', nodever)]
162+
157163
pandocexe = get_tool_path (r'\tools\pandoc.exe', osp.isfile)
158164
if pandocexe is not None:
159165
pandocver = utils.get_pandoc_version(osp.dirname(pandocexe))
@@ -243,6 +249,8 @@ def prepath(self):
243249

244250
path += [r".." + self.JULIA_PATH]
245251

252+
path += [r".." + self.NODEJS_PATH]
253+
246254
return path
247255

248256
@property

‎winpython/data/packages.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,9 @@ description=Collection of low-level Python packages and modules used by Logilab
562562
[logutils]
563563
description=Logging utilities
564564
565+
[loky]
566+
description=Robust and reusable Executor for joblib
567+
565568
[lxml]
566569
description=Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
567570

‎winpython/data/tools.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ url=http://tortoisehg.bitbucket.org
2929
[winmerge]
3030
description=Open Source differencing and merging tool for Windows
3131
url=http://winmerge.org
32+
33+
[nodejs]
34+
description=a JavaScript runtime built on Chrome's V8 JavaScript engine
35+
url=https://nodejs.org

‎winpython/utils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@ def get_julia_version(path):
228228
"""Return version of the Julia installed in *path*"""
229229
return exec_shell_cmd('julia.exe -v', path).splitlines()[0].split(" ")[-1]
230230

231+
def get_nodejs_version(path):
232+
"""Return version of the Nodejs installed in *path*"""
233+
return exec_shell_cmd('npm version', path).split(" node: '")[1].split("'")[0]
231234

232235
def get_thg_version(path):
233236
"""Return version of TortoiseHg installed in *path*"""

0 commit comments

Comments
 (0)
0