From 65acce971b04bd112ae6bfaa3b7a17c2ba741461 Mon Sep 17 00:00:00 2001
From: stonebig <stonebig>
Date: Sun, 31 Dec 2017 17:33:40 +0100
Subject: [PATCH] new tools and package names

---
 make.py                     |  2 ++
 winpython/__init__.py       |  2 +-
 winpython/data/packages.ini | 18 +++++++++++++++---
 winpython/data/tools.ini    |  8 ++++++++
 winpython/utils.py          |  4 ++++
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/make.py b/make.py
index f15071e7..493069cf 100644
--- a/make.py
+++ b/make.py
@@ -159,6 +159,8 @@ def get_tool_path(relpath, checkfunc):
         if nodepath is not None:
             nodever = utils.get_nodejs_version(nodepath)
             installed_tools += [('Nodejs', nodever)]
+            npmver = utils.get_npmjs_version(nodepath)
+            installed_tools += [('npmjs', npmver)]
 
         pandocexe = get_tool_path (r'\tools\pandoc.exe', osp.isfile)
         if pandocexe is not None:
diff --git a/winpython/__init__.py b/winpython/__init__.py
index 576eb373..7d6554d2 100644
--- a/winpython/__init__.py
+++ b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '1.9.20171031'
+__version__ = '1.9.20171230'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
index 9f589698..512e7397 100644
--- a/winpython/data/packages.ini
+++ b/winpython/data/packages.ini
@@ -47,7 +47,7 @@ description=tools for machine learning and data mining in Astronomy
 description=Community-developed python astronomy tools
 
 [attrs]
-description=Attributes without boilerplate.
+description=Classes Without Boilerplate
 
 [babel]
 description=Internationalization utilities
@@ -196,6 +196,9 @@ description=Code coverage measurement for Python
 [cryptography]
 description=cryptography is a package which provides cryptographic recipes and primitives to Python developers
 
+[cupy]
+description=NumPy-like API accelerated with CUD
+
 [cvxcanon]
 description=common operations for convex optimization modeling tools.
 
@@ -305,6 +308,9 @@ description=A python package that provides useful locks.
 [fastparquet]
 description=Python support for Parquet file format
 
+[fastrlock]
+description=A fast RLock implementation for CPython
+
 [fast-histogram]
 description=Fast 1D and 2D histogram functions in Python
 
@@ -329,6 +335,9 @@ description=SeaSurf is a Flask extension for preventing cross-site request forge
 [flexx]
 description=Pure Python toolkit for creating GUI's using web technology.
 
+[flit]
+description=Simplified packaging of Python modules
+
 [fonttools]
 description=Tools to manipulate font files
 
@@ -433,8 +442,8 @@ description=General-purpose Python interface to HDF5 files (unlike PyTables, h5p
 [ibis-framework]
 description=Productivity-centric Python Big Data Framework
 
-[ipykernel]
-description=IPython Kernel for Jupyter
+[ipydatawidgets]
+description=A set of widgets to help facilitate reuse of large datasets across widgets
 
 [idlex]
 description=IDLE Extensions for Python
@@ -864,6 +873,9 @@ description=A grammar of graphics for python
 [plotpy]
 description=plotpy is a set of tools for curve and image plotting 
 
+[pluggy]
+description=plugin and hook calling mechanisms for python 
+
 [ply]
 description=Python Lex & Yacc
 
diff --git a/winpython/data/tools.ini b/winpython/data/tools.ini
index cdebdc6b..0f27fc8f 100644
--- a/winpython/data/tools.ini
+++ b/winpython/data/tools.ini
@@ -34,6 +34,14 @@ url=http://winmerge.org
 description=a JavaScript runtime built on Chrome's V8 JavaScript engine
 url=https://nodejs.org
 
+[npmjs]
+description=a package manager for JavaScript
+url=https://www.npmjs.com/
+
+[yarnpkg]
+description=a package manager for JavaScriptFast, reliable, and secure dependency management
+url=https://yarnpkg.com/lang/en/
+
 [ffmpeg]
 description=a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata
 url=https://ffmpeg.org
diff --git a/winpython/utils.py b/winpython/utils.py
index 9c630cee..28354e13 100644
--- a/winpython/utils.py
+++ b/winpython/utils.py
@@ -232,6 +232,10 @@ def get_nodejs_version(path):
     """Return version of the Nodejs installed in *path*"""
     return exec_shell_cmd('node -v', path).splitlines()[0]
 
+def get_npmjs_version(path):
+    """Return version of the Nodejs installed in *path*"""
+    return exec_shell_cmd('npm -v', path).splitlines()[0]
+    
 def get_thg_version(path):
     """Return version of TortoiseHg installed in *path*"""
     txt = exec_shell_cmd('thg version', path).splitlines()[0]