Fix: version number in filename for distribution. (opensearch-project#588)

Signed-off-by: dblock <dblock@amazon.com>

Author: dblock

setup.py

@@ -36,9 +36,12 @@
 base_dir = abspath(dirname(__file__))
 
 with open(join(base_dir, package_name.replace("-", ""), "_version.py")) as f:
-    m = re.search(r"__versionstr__\s+=\s+[\"\']([^\"\']+)[\"\']", f.read())
+    data = f.read()
+    m = re.search(r"^__versionstr__: str\s+=\s+[\"\']([^\"\']+)[\"\']", data, re.M)
     if m:
         package_version = m.group(1)
+    else:
+        raise Exception(f"Invalid version: {data}")
 
 with open(join(base_dir, "README.md")) as f:
     long_description = f.read().strip()

utils/build-dists.py

@@ -194,7 +194,7 @@ def main() -> None:
         if m:
             version = m.group(1)
         else:
-            raise Exception(f"Invalid version {data}")
+            raise Exception(f"Invalid version: {data}")
 
     major_version = version.split(".")[0]
 
@@ -258,8 +258,8 @@ def main() -> None:
         with open(version_path) as f:
             version_data = f.read()
         version_data = re.sub(
-            r"__versionstr__ = \"[^\"]+\"",
-            '__versionstr__ = "%s"' % version,
+            r"__versionstr__: str = \"[^\"]+\"",
+            '__versionstr__: str = "%s"' % version,
             version_data,
         )
         with open(version_path, "w") as f: