Skip to content

PyPy compatibility preparation step3 #972

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
merged 1 commit into from
Apr 22, 2021
Merged

PyPy compatibility preparation step3 #972

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
22 changes: 12 additions & 10 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ def __init__(
# .groups()[0]
# .split('.')
#)
self.python_version = 'winUNKNOWN' # '.'.join(vlst[:2])
self.python_fullversion = 'winUNKNOWN' # '.'.join(vlst[:3])

@property
Expand Down Expand Up @@ -2034,22 +2033,20 @@ def make(
self.python_fname,
self.python_name,
self.distname,
self.python_version,
self.python_fullversion,
)
# Create the WinPython base directory
self._print(
"Creating WinPython %s base directory"
% self.python_version
self.python_fullversion, # PyPy to delete or move
)
if my_winpydir is None:
self.winpydir = osp.join(
self.target, self.distname
self.target, self.distname # PyPy to delete
)
else:
self.winpydir = osp.join(
self.target, my_winpydir
)
) # Create/re-create the WinPython base directory
self._print(
"Creating WinPython %s base directory"
% my_winpydir
)
if (
osp.isdir(self.winpydir)
and remove_existing
Expand All @@ -2072,12 +2069,17 @@ def make(

if remove_existing and not self.simulation:
self._extract_python() # unzip Python interpreter

self.distribution = wppm.Distribution(
self.python_dir,
verbose=self.verbose,
indent=True,
)

# PyPy: get Fullversion from the executable
self.python_fullversion = utils.get_python_long_version(
self.distribution.target)

if remove_existing:
if not self.simulation:
# self._add_msvc_files() # replaced per msvc_runtime package
Expand Down