Make format_version a str

VIDA-NYU · Feb 1, 2024 · 2182344 · 2182344
1 parent 5654e6c
commit 2182344
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/reprounzip/reprounzip/parameters.py b/reprounzip/reprounzip/parameters.py
@@ -68,10 +68,10 @@ def update_parameters():
             except OSError:
                 pass
         else:
-            ver = packaging.version.parse(parameters.get('version', '1.0'))
+            ver = parameters.get('version', '1.0')
             if (
                 packaging.version.parse('1.1')
-                <= ver
+                <= packaging.version.parse(ver)
                 < packaging.version.parse('3.0')
             ):
                 return

diff --git a/reprounzip/reprounzip/unpackers/graph.py b/reprounzip/reprounzip/unpackers/graph.py
@@ -479,9 +479,13 @@ def generate(target, configfile, database, all_forks=False, graph_format='dot',
     inputs_outputs = config.inputs_outputs
     inputs_outputs_map = dict((f.path, n)
                               for n, f in config.inputs_outputs.items())
-    has_thread_flag = config.format_version >= packaging.version.parse('0.7')
+    has_thread_flag = (
+        packaging.version.parse(config.format_version)
+        >= packaging.version.parse('0.7')
+    )
     has_exit_timestamp = (
-        config.format_version >= packaging.version.parse('1.1')
+        packaging.version.parse(config.format_version)
+        >= packaging.version.parse('1.1')
     )
 
     runs, files, edges = read_events(database, all_forks,

diff --git a/reprounzip/reprounzip/unpackers/provviewer.py b/reprounzip/reprounzip/unpackers/provviewer.py
@@ -44,7 +44,10 @@ def generate(target, configfile, database):
 
     config = load_config(configfile, canonical=False)
 
-    has_thread_flag = config.format_version >= packaging.version.parse('0.7')
+    has_thread_flag = (
+        packaging.version.parse(config.format_version)
+        >= packaging.version.parse('0.7')
+    )
 
     assert database.is_file()
     conn = sqlite3.connect(str(database))  # connect() only accepts str

diff --git a/reprozip-core/reprozip_core/common.py b/reprozip-core/reprozip_core/common.py
@@ -612,15 +612,15 @@ def load_config(filename, canonical):
     # Turn bytes values into Python 3 str values
     _bytes_to_surrogates(config)
 
-    ver = packaging.version.parse(config['version'])
+    ver = config['version']
 
     keys_ = set(config)
     if 'version' not in keys_:
         raise InvalidConfig("Missing version")
     # Accepts versions from 0.2 to 1.1 inclusive
     elif not (
         packaging.version.parse('0.2')
-        <= ver
+        <= packaging.version.parse(ver)
         < packaging.version.parse('1.2')
     ):
         pkgname = (__package__ or __name__).split('.', 1)[0]