Merge pull request winpython#975 from stonebig/master

stonebig · web-flow · commit 0eb5cc065d20 · 2021-04-24T12:17:14.000+02:00
ensure Python version matches WinPython build directory
diff --git a/hash.py b/hash.py
@@ -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("|")]
@@ -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)}")
         
          
 
diff --git a/make.py b/make.py
@@ -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:
