Merge pull request #501 from stonebig/master

stonebig · web-flow · commit 614be8fef69e · 2017-02-26T09:39:14.000+01:00
compatiblity tweak for Neard users
diff --git a/make.py b/make.py
@@ -553,10 +553,13 @@ def _create_batch_scripts_initial(self):
 
         self.create_batch_script('env.bat', r"""@echo off
 set WINPYDIRBASE=%~dp0..
+
 rem get a normalize path
-CALL :NORMALIZEPATH "%WINPYDIRBASE%"
-set WINPYDIRBASE=%RETVAL%
-set RETVAL=
+set WINPYDIRBASETMP=%~dp0..
+pushd %WINPYDIRBASETMP%
+set WINPYDIRBASE=%CD%
+set WINPYDIRBASETMP=
+popd
 
 set WINPYDIR=%WINPYDIRBASE%"""+"\\" + self.python_name + r"""
 
@@ -609,16 +612,6 @@ def _create_batch_scripts_initial(self):
     echo #WINPYWORKDIR = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\Notebooks>>"%winpython_ini%"
 )
 
-rem *****
-rem http://stackoverflow.com/questions/1645843/resolve-absolute-path-from-relative-path-and-or-file-name
-rem *****
-:: ========== FUNCTIONS ==========
-EXIT /B
-
-:NORMALIZEPATH
-  SET RETVAL=%~dpfn1
-  EXIT /B
-
 """)
 
         self.create_batch_script('WinPython_PS_Prompt.ps1', r"""
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -562,6 +562,9 @@ description=D3 Viewer for Matplotlib
 [mpmath]
 description=Python library for arbitrary-precision floating-point arithmetic
 
+[mypy]
+description=Optional static typing for Python
+
 [msgpack-python]
 description=MessagePack (de)serializer.
 
@@ -1312,6 +1315,9 @@ description=An API and command-line toolset for Twitter (twitter.com)
 [twython]
 description=Actively maintained, pure Python wrapper for the Twitter API. Supports both normal and streaming Twitter APIs
 
+[typed_ast]
+description=a fork of Python 2 and 3 ast modules with type comment support
+
 [uritemplate]
 description=URI templates
 
