Skip to content

tweak PyPy-3.7 launchers #1013

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 1 commit into from
Sep 18, 2021
Merged

tweak PyPy-3.7 launchers #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,8 @@ def _create_batch_scripts_initial(self):
(r'DIR%\python.exe' , r'DIR%' + "\\" + shorty),
(r'DIR%\PYTHON.EXE' , r'DIR%' + "\\" + shorty),
)
if shorty == 'pypy3.exe':
if osp.isdir(osp.join(self.distribution.target,
r'lib-python\3\idlelib')):
changes += ((r'\Lib\idlelib' , r'\lib-python\3\idlelib'),)
self.create_batch_script(
'env.bat',
Expand Down Expand Up @@ -1477,7 +1478,8 @@ def _create_batch_scripts(self):
(r'DIR%\python.exe' , r'DIR%' + "\\" + shorty),
(r'DIR%\PYTHON.EXE' , r'DIR%' + "\\" + shorty),
)
if shorty == 'pypy3.exe':
if osp.isdir(osp.join(self.distribution.target,
r'lib-python\3\idlelib')):
changes += ((r'\Lib\idlelib' , r'\lib-python\3\idlelib'),)


Expand Down
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.5.20210912'
__version__ = '4.5.20210918'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'
8 changes: 4 additions & 4 deletions winpython/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def get_python_executable(path = None):
"""return the python executable"""
my_path = sys.executable if path == None else path # default = current one
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 !
exec_py = os.path.join(my_path, 'python.exe')
exec_pypy = os.path.join(my_path, 'pypy3.exe') # PyPy !
# 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
Expand All @@ -44,8 +44,8 @@ def get_site_packages_path(path = None):
"""return the python site-packages"""
my_path = sys.executable if path == None else path # default = current one
my_path = my_path if osp.isdir(my_path) else osp.dirname(my_path)
site_py = os.path.join(path, 'Lib', 'site-packages')
site_pypy = os.path.join(path, 'site-packages') # PyPy !!
site_py = os.path.join(my_path, 'Lib', 'site-packages')
site_pypy = os.path.join(my_path, 'site-packages') # PyPy !!
site_packages_path = site_pypy if osp.isfile(site_pypy) else site_py
return site_packages_path

Expand Down