Fix parsing of current version

Author: nsoranzo

scripts/commit_version.py

@@ -13,7 +13,7 @@ def main(argv):
     source_dir = argv[1]
     version = argv[2]
     history_path = os.path.join(PROJECT_DIRECTORY, "HISTORY.rst")
-    with open(history_path, "r") as f:
+    with open(history_path) as f:
         history = f.read()
     today = datetime.datetime.today()
     today_str = today.strftime("%Y-%m-%d")
@@ -22,21 +22,12 @@ def main(argv):
         f.write(history)
 
     source_mod_path = os.path.join(PROJECT_DIRECTORY, source_dir, "__init__.py")
-    with open(source_mod_path, "r") as f:
+    with open(source_mod_path) as f:
         mod = f.read()
-    mod = re.sub("__version__ = '[\d\.]*\.dev0'", "__version__ = '%s'" % version, mod)
+    mod = re.sub(r'__version__ = "[\d\.]*\.dev0"', f'__version__ = "{version}"', mod)
     with open(source_mod_path, "w") as f:
         mod = f.write(mod)
-    shell(
-        [
-            "git",
-            "commit",
-            "-m",
-            "Version %s" % version,
-            "HISTORY.rst",
-            "%s/__init__.py" % source_dir,
-        ]
-    )
+    shell(["git", "commit", "-m", f"Version {version}", "HISTORY.rst", f"{source_dir}/__init__.py"])
     shell(["git", "tag", version])
 
 

scripts/new_version.py

@@ -28,7 +28,7 @@ def main(argv):
     new_version = ".".join(map(str, new_version_tuple))
 
     history_path = os.path.join(PROJECT_DIRECTORY, "HISTORY.rst")
-    with open(history_path, "r") as f:
+    with open(history_path) as f:
         history = f.read()
 
     def extend(from_str, line):
@@ -48,21 +48,12 @@ def extend(from_str, line):
         f.write(history)
 
     source_mod_path = os.path.join(PROJECT_DIRECTORY, source_dir, "__init__.py")
-    with open(source_mod_path, "r") as f:
+    with open(source_mod_path) as f:
         mod = f.read()
-    mod = re.sub(r"__version__ = '[\d\.]+'", "__version__ = '%s.dev0'" % new_version, mod, 1)
+    mod = re.sub(r'__version__ = "[\d\.]+"', f"__version__ = '{new_version}.dev0'", mod, 1)
     with open(source_mod_path, "w") as f:
         mod = f.write(mod)
-    shell(
-        [
-            "git",
-            "commit",
-            "-m",
-            "Starting work on %s" % new_version,
-            "HISTORY.rst",
-            "%s/__init__.py" % source_dir,
-        ]
-    )
+    shell(["git", "commit", "-m", f"Starting work on {new_version}", "HISTORY.rst", f"{source_dir}/__init__.py"])
 
 
 def shell(cmds, **kwds):

scripts/print_version_for_release.py

@@ -10,8 +10,8 @@
 
 _version_re = re.compile(r"__version__\s+=\s+(.*)")
 
-with open("%s/__init__.py" % source_dir, "rb") as f:
-    version = str(ast.literal_eval(_version_re.search(f.read().decode("utf-8")).group(1)))
+with open(f"{source_dir}/__init__.py") as f:
+    version = str(ast.literal_eval(_version_re.search(f.read()).group(1)))
 
 version_obj = Version(version)
 # Strip .devN