1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
Description: Python3.12 compatibility
Bug-Debian: https://bugs.debian.org/1061838
Author: Andreas Tille <tille@debian.org>
Last-Update: Thu, 08 Feb 2024 14:38:22 +0100
--- a/reprounzip/common.py
+++ b/reprounzip/common.py
@@ -24,7 +24,7 @@ import atexit
import contextlib
import copy
from datetime import datetime
-from distutils.version import LooseVersion
+import packaging.version
import functools
import gzip
import logging
@@ -533,13 +533,13 @@ def load_config(filename, canonical, Fil
with filename.open(encoding='utf-8') as fp:
config = yaml.safe_load(fp)
- ver = LooseVersion(config['version'])
+ ver = packaging.version.Version(config['version'])
keys_ = set(config)
if 'version' not in keys_:
raise InvalidConfig("Missing version")
# Accepts versions from 0.2 to 0.8 inclusive
- elif not LooseVersion('0.2') <= ver < LooseVersion('0.9'):
+ elif not packaging.version.Version('0.2') <= ver < packaging.version.Version('0.9'):
pkgname = (__package__ or __name__).split('.', 1)[0]
raise InvalidConfig("Loading configuration file in unknown format %s; "
"this probably means that you should upgrade "
--- a/reprounzip/parameters.py
+++ b/reprounzip/parameters.py
@@ -15,7 +15,7 @@ and Docker images for various operating
from __future__ import division, print_function, unicode_literals
-from distutils.version import LooseVersion
+import packaging.version
import json
import logging
import os
@@ -70,8 +70,8 @@ def update_parameters():
except OSError:
pass
else:
- ver = LooseVersion(parameters.get('version', '1.0'))
- if LooseVersion('1.0') <= ver < LooseVersion('1.1'):
+ ver = packaging.version.Version(parameters.get('version', '1.0'))
+ if packaging.version.Version('1.0') <= ver < packaging.version.Version('1.1'):
return
else:
logger.info("parameters.json has incompatible version %s, "
--- a/reprounzip/unpackers/graph.py
+++ b/reprounzip/unpackers/graph.py
@@ -17,7 +17,7 @@ See http://www.graphviz.org/
from __future__ import division, print_function, unicode_literals
import argparse
-from distutils.version import LooseVersion
+import packaging.version
import heapq
import json
import logging
@@ -474,7 +474,7 @@ def generate(target, configfile, databas
inputs_outputs = config.inputs_outputs
inputs_outputs_map = dict((f.path, n)
for n, f in iteritems(config.inputs_outputs))
- has_thread_flag = config.format_version >= LooseVersion('0.7')
+ has_thread_flag = config.format_version >= packaging.version.Version('0.7')
runs, files, edges = read_events(database, all_forks,
has_thread_flag)
--- a/reprounzip/unpackers/provviewer.py
+++ b/reprounzip/unpackers/provviewer.py
@@ -14,7 +14,7 @@ from __future__ import division, print_f
import argparse
import logging
-from distutils.version import LooseVersion
+import packaging.version
from rpaths import Path
import sqlite3
import sys
@@ -47,7 +47,7 @@ def generate(target, configfile, databas
config = load_config(configfile, canonical=False)
- has_thread_flag = config.format_version >= LooseVersion('0.7')
+ has_thread_flag = config.format_version >= packaging.version.Version('0.7')
assert database.is_file()
if PY3:
|
