Merge pull request #412 from stonebig/master

stonebig · web-flow · commit 6b24303f90f7 · 2016-10-16T15:11:17.000+02:00
Fix for WinPython-3.6.0.0
diff --git a/make.py b/make.py
@@ -389,9 +389,14 @@ def _extract_python(self):
         os.mkdir(self.python_dir)
         if  self.python_fname[-3:] == 'zip':  # Python3.5
            utils.extract_archive(self.python_fname, targetdir=self.python_dir+r'\..')
-           # new Python 3.5 trick (https://bugs.python.org/issue23955)
-           pyvenv_file = osp.join(self.python_dir, 'pyvenv.cfg')
-           open(pyvenv_file, 'w').write('applocal=True\n')
+           if self.winpyver < "3.6":
+               # new Python 3.5 trick (https://bugs.python.org/issue23955)
+               pyvenv_file = osp.join(self.python_dir, 'pyvenv.cfg')
+               open(pyvenv_file, 'w').write('applocal=True\n')
+           else:
+               # new Python 3.6 trick (https://docs.python.org/3.6/using/windows.html#finding-modules)
+               pypath_file = osp.join(self.python_dir, 'python._pth')
+               open(pypath_file, 'w').write('.\nLib\nimport site\nDLLs\n#Lib/site-packages\n#python36.zip\n')
         else:   
            utils.extract_msi(self.python_fname, targetdir=self.python_dir)
            os.remove(osp.join(self.python_dir, osp.basename(self.python_fname)))
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -528,6 +528,9 @@ description=LaTeX-free PDF generation from Jupyter Notebooks
 [nbconvert]
 description=Converting Jupyter Notebooks
 
+[nbconvert_reportlab]
+description=Convert notebooks to PDF using Reportlab
+
 [nbdime]
 description=Tools for diffing and merging of Jupyter notebooks
 
@@ -628,6 +631,10 @@ description=A module wrapper for os.path
 description=Describing statistical models using symbolic formulas
 category=dataoric
 
+[pdfrw]
+description=pure Python library that reads and writes PDFs
+
+
 [peewee]
 description=a small, expressive ORM. 
 
