Merge pull request winpython#1010 from stonebig/master

stonebig · web-flow · commit 018d03c98236 · 2021-09-13T23:23:03.000+02:00
PyPy-3.8 normalization
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '4.4.20210812'
+__version__ = '4.5.20210912'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -3199,3 +3199,9 @@ description = Thin Python bindings to de/compression algorithms in Rust
 [rich]
 description = Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal
 
+[fastdownload]
+description = A general purpose data downloading library.
+
+[dateutils]
+description = Various utilities for working with date and datetime objects
+
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -35,7 +35,9 @@ def get_python_executable(path = None):
     my_path = my_path if osp.isdir(my_path) else osp.dirname(my_path)
     exec_py = os.path.join(path, 'python.exe')
     exec_pypy = os.path.join(path, 'pypy3.exe')  # PyPy !
-    python_executable = exec_pypy if osp.isfile(exec_pypy) else exec_py
+    # PyPy >=7.3.6 3.8 aligns to python.exe and Lib\site-packages
+    #python_executable = exec_pypy if osp.isfile(exec_pypy) else exec_py
+    python_executable = exec_py if osp.isfile(exec_py) else exec_pypy
     return python_executable
 
 def get_site_packages_path(path = None):
@@ -368,6 +370,8 @@ def get_pandoc_version(path):
 def python_query(cmd, path):
     """Execute Python command using the Python interpreter located in *path*"""
     the_exe = get_python_executable(path)
+    # debug2021-09-12
+    print('%s -c "%s"' % (the_exe, cmd), ' * ',  path)
     return exec_shell_cmd('%s -c "%s"' % (the_exe, cmd), path).splitlines()[0]
 
 def python_execmodule(cmd, path):
