Merge pull request winpython#907 from stonebig/master

stonebig · web-flow · commit db1782ffc494 · 2020-12-12T10:25:09.000+01:00
preparing for WinPython 2020-05
diff --git a/make.py b/make.py
@@ -1990,7 +1990,7 @@ def make(
             # pre-patch current pip (until default python has pip 8.0.3)
             self.distribution.patch_standard_packages('pip')
             # not forced update of pip (FIRST) and setuptools here
-            for req in ('pip', 'setuptools', 'winpython'):
+            for req in ('pip', 'setuptools', 'wheel', 'winpython'):
                 actions = ["install", "--upgrade", "--pre", req]
                 if self.install_options is not None:
                     actions += self.install_options
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '3.0.20201028'
+__version__ = '3.0.202011212'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -2758,3 +2758,27 @@ description = A Great Dane turned Python environment detective
 [meshio]
 description = I/O for many mesh formats
 
+[dask-sql]
+description = Dask SQL
+
+[jpype1]
+description = A Python to Java bridge.
+
+[three-merge]
+description = Simple library for merging two strings with respect to a base one
+
+[pyls-spyder]
+description = Spyder extensions for the python-language-server
+
+[pyls-black]
+description = Black plugin for the Python Language Server
+
+[pysocks]
+description = A Python SOCKS client module. See https github.com/Anorov/PySocks for more information.
+
+[pyinstaller-hooks-contrib]
+description = Community maintained hooks for PyInstaller
+
+[nbval]
+description = A py.test plugin to validate Jupyter notebooks
+
