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
|
Description: Fix autopkgtest by replacing distutils
Bug-Debian: https://bugs.debian.org/1061784
Author: Andreas Tille <tille@debian.org>
Last-Update: 2024-02-01
--- a/ariba/external_progs.py
+++ b/ariba/external_progs.py
@@ -1,7 +1,7 @@
import shutil
import subprocess
import os
-from distutils.version import LooseVersion
+from packaging.version import Version as LooseVersion
import re
import sys
from ariba import common
--- a/ariba/mapping.py
+++ b/ariba/mapping.py
@@ -1,6 +1,6 @@
import os
import sys
-from distutils.version import LooseVersion
+from packaging.version import Version as LooseVersion
import pysam
import pyfastaq
from ariba import common
--- a/ariba/megares_data_finder.py
+++ b/ariba/megares_data_finder.py
@@ -1,6 +1,6 @@
import urllib.request
from bs4 import BeautifulSoup
-from distutils.version import LooseVersion
+from packaging.version import Version as LooseVersion
class Error (Exception): pass
--- a/ariba/versions.py
+++ b/ariba/versions.py
@@ -1,5 +1,5 @@
import sys
-from distutils.version import LooseVersion
+from packaging.version import Version as LooseVersion
from ariba import external_progs
from ariba import __version__ as ariba_version
@@ -43,7 +43,7 @@ def get_all_versions(raise_error=True, u
python_packages_ok = False
if version != 'NOT_FOUND':
- if package in package_min_versions and LooseVersion(version) < package_min_versions[package]:
+ if package in package_min_versions and LooseVersion(version) < LooseVersion(package_min_versions[package]):
version += '... THIS IS TOO LOW. Needs>=' + package_min_versions[package]
python_packages_ok = False
elif package in package_max_versions and LooseVersion(version) > package_max_versions[package]:
|
