Skip to content

ensure Python version matches WinPython build directory #975

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
Apr 24, 2021
Merged

ensure Python version matches WinPython build directory #975

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: 3 additions & 3 deletions hash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def give_hash(file_in, with_this):
+ " " * (33 - 5)
+ "| Size"
+ " " * (20 - 6)
#+ " | SHA3-256"
#+ " " * (64 - 7)
+ " | SHA3-256"
+ " " * (64 - 7)
)
line = "|".join(
["-" * len(i) for i in header.split("|")]
Expand All @@ -52,7 +52,7 @@ def give_hash(file_in, with_this):
f"{give_hash(file, hashlib.sha1)} | " +
f"{give_hash(file, hashlib.sha256)} | " +
f"{os.path.basename(file):33} |"+
f"{os.path.getsize(file):13,}".replace(",", " ") + ' Bytes' ) #+ f"{give_hash(file, hashlib.sha3_256)}")
f"{os.path.getsize(file):13,}".replace(",", " ") + ' Bytes' + f" | {give_hash(file, hashlib.sha3_256)}")



9 changes: 9 additions & 0 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,6 +2079,15 @@ def make(
# PyPy: get Fullversion from the executable
self.python_fullversion = utils.get_python_long_version(
self.distribution.target)

# PyPY: Assert that WinPython version and real python version do match
self._print(f"Python version{self.python_fullversion.replace('.','')}"+
f"\nDistro Name {self.distribution.target}")
assert self.python_fullversion.replace('.','') in \
self.distribution.target, \
"Distro Directory doesn't match the Python version it ships" + \
f"\nPython version: {self.python_fullversion.replace('.','')}"+ \
f"\nDistro Name: {self.distribution.target}"

if remove_existing:
if not self.simulation:
Expand Down