Skip to content

PyPy-3.8 normalization #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 2 commits into from
Sep 13, 2021
Merged

PyPy-3.8 normalization #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28cfd45
package names
stonebig Sep 12, 2021
e2f85c6
PyPy-3.8 normalization
stonebig Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion winpython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
6 changes: 6 additions & 0 deletions winpython/data/packages.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

6 changes: 5 additions & 1 deletion winpython/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down