Merge pull request #3018 from appolloford/looseversion

Use `LooseVersion` from `easybuild.tools` and sort imports

easybuild/easyblocks/__init__.py

@@ -32,7 +32,6 @@
 @author: Jens Timmerman (Ghent University)
 """
 import os
-from distutils.version import LooseVersion
 from pkgutil import extend_path
 
 # note: release candidates should be versioned as a pre-release, e.g. "1.1rc1"
@@ -43,7 +42,7 @@
 # recent setuptools versions will *TRANSFORM* something like 'X.Y.Zdev' into 'X.Y.Z.dev0', with a warning like
 #   UserWarning: Normalizing '2.4.0dev' to '2.4.0.dev0'
 # This causes problems further up the dependency chain...
-VERSION = LooseVersion('5.0.0.dev0')
+VERSION = '5.0.0.dev0'
 UNKNOWN = 'UNKNOWN'
 
 
@@ -76,7 +75,7 @@ def get_git_revision():
 if git_rev == UNKNOWN:
     VERBOSE_VERSION = VERSION
 else:
-    VERBOSE_VERSION = LooseVersion("%s-r%s" % (VERSION, git_rev))
+    VERBOSE_VERSION = "%s-r%s" % (VERSION, git_rev)
 
 # extend path so python finds our easyblocks in the subdirectories where they are located
 subdirs = [chr(x) for x in range(ord('a'), ord('z') + 1)] + ['0']

easybuild/easyblocks/a/abaqus.py

@@ -35,7 +35,7 @@
 import glob
 import os
 from collections import OrderedDict
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.binary import Binary
 from easybuild.framework.easyblock import EasyBlock

easybuild/easyblocks/a/acml.py

@@ -33,7 +33,7 @@
 """
 
 import os
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.framework.easyblock import EasyBlock
 from easybuild.framework.easyconfig import CUSTOM

easybuild/easyblocks/a/advisor.py

@@ -31,7 +31,7 @@
 """
 
 import os
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.intelbase import IntelBase
 

easybuild/easyblocks/a/amber.py

@@ -31,7 +31,7 @@
 Enhanced/cleaned up by Kenneth Hoste (HPC-UGent)
 CMake support (Amber 20) added by James Carpenter and Simon Branford (University of Birmingham)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import os
 
 import easybuild.tools.environment as env

easybuild/easyblocks/a/ansys.py

@@ -31,7 +31,7 @@
 import os
 import re
 import stat
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.tools.build_log import EasyBuildError

easybuild/easyblocks/a/aocc.py

@@ -34,7 +34,7 @@
 import os
 import stat
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.framework.easyconfig import CUSTOM

easybuild/easyblocks/a/armadillo.py

@@ -28,7 +28,7 @@
 @author: Kenneth Hoste (Ghent University)
 """
 import os
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 from easybuild.easyblocks.generic.cmakemake import CMakeMake
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.modules import get_software_root

easybuild/easyblocks/a/atlas.py

@@ -36,7 +36,7 @@
 import re
 import os
 import sys
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.configuremake import ConfigureMake
 from easybuild.framework.easyconfig import CUSTOM

easybuild/easyblocks/b/bamtools.py

@@ -28,7 +28,7 @@
 @author: Andreas Panteli (The Cyprus Institute)
 @author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 from easybuild.easyblocks.generic.cmakemake import CMakeMake
 from easybuild.easyblocks.generic.makecp import MakeCp
 from easybuild.framework.easyconfig import CUSTOM

easybuild/easyblocks/b/bazel.py

@@ -25,7 +25,7 @@
 """
 EasyBuild support for building and installing Bazel, implemented as an easyblock
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import glob
 import os
 import tempfile

easybuild/easyblocks/b/berkeleygw.py

@@ -28,7 +28,7 @@
 @author: Miguel Dias Costa (National University of Singapore)
 """
 import os
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.toolchain as toolchain
 from easybuild.easyblocks.generic.configuremake import ConfigureMake

easybuild/easyblocks/b/binutils.py

@@ -30,7 +30,7 @@
 import glob
 import os
 import re
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.environment as env
 from easybuild.easyblocks.generic.configuremake import ConfigureMake

easybuild/easyblocks/b/boost.py

@@ -38,7 +38,7 @@
 @author: Michele Dolfi (ETH Zurich)
 @author: Simon Branford (University of Birmingham)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import fileinput
 import glob
 import os

easybuild/easyblocks/b/bowtie.py

@@ -30,7 +30,7 @@
 @author: Kenneth Hoste (Ghent University)
 @author: Jens Timmerman (Ghent University)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import glob
 import os
 import shutil

easybuild/easyblocks/b/bowtie2.py

@@ -16,7 +16,7 @@
 @author: Fotis Georgatos (Uni.Lu)
 @author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import os
 
 from easybuild.easyblocks.generic.makecp import MakeCp

easybuild/easyblocks/b/bwa.py

@@ -20,7 +20,7 @@
 """
 import os
 import glob
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.configuremake import ConfigureMake
 from easybuild.tools.build_log import EasyBuildError

easybuild/easyblocks/c/cgal.py

@@ -31,7 +31,7 @@
 """
 import os
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.cmakemake import CMakeMake
 from easybuild.tools.build_log import EasyBuildError

easybuild/easyblocks/c/clang.py

@@ -38,7 +38,7 @@
 import glob
 import os
 import shutil
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.cmakemake import CMakeMake
 from easybuild.framework.easyconfig import CUSTOM

easybuild/easyblocks/c/clang_aomp.py

@@ -31,7 +31,7 @@
 import glob
 import os
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 from easybuild.easyblocks.clang import DEFAULT_TARGETS_MAP as LLVM_ARCH_MAP
 from easybuild.easyblocks.generic.bundle import Bundle
 from easybuild.framework.easyblock import EasyBlock

easybuild/easyblocks/c/cp2k.py

@@ -42,7 +42,7 @@
 import re
 import os
 import sys
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.toolchain as toolchain
 from easybuild.framework.easyblock import EasyBlock

easybuild/easyblocks/c/cplex.py

@@ -31,7 +31,7 @@
 @author: Pieter De Baets (Ghent University)
 @author: Jens Timmerman (Ghent University)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import glob
 import os
 import stat

easybuild/easyblocks/c/cryptography.py

@@ -27,7 +27,7 @@
 
 @author: Alexander Grund
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.pythonpackage import PythonPackage
 from easybuild.tools.run import run_cmd

easybuild/easyblocks/c/cuda.py

@@ -38,7 +38,7 @@
 import re
 import stat
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.binary import Binary
 from easybuild.framework.easyconfig import CUSTOM

easybuild/easyblocks/c/cudacompat.py

@@ -31,7 +31,7 @@
 """
 
 import os
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.binary import Binary
 from easybuild.framework.easyconfig import CUSTOM, MANDATORY

easybuild/easyblocks/c/cudnn.py

@@ -28,7 +28,7 @@
 @author: Simon Branford (University of Birmingham)
 @author: Robert Mijakovic (LuxProvide)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.tarball import Tarball
 from easybuild.tools.build_log import EasyBuildError

easybuild/easyblocks/d/dolfin.py

@@ -32,7 +32,7 @@
 import os
 import re
 import tempfile
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.environment as env
 import easybuild.tools.toolchain as toolchain

easybuild/easyblocks/d/doxygen.py

@@ -33,7 +33,7 @@
 @author: Balazs Hajgato (Free University Brussels (VUB))
 """
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 from easybuild.tools.run import run_cmd
 from easybuild.easyblocks.generic.cmakemake import CMakeMake
 

easybuild/easyblocks/e/easybuildmeta.py

@@ -32,7 +32,7 @@
 import re
 import sys
 from collections import OrderedDict
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.pythonpackage import PythonPackage, det_pip_version
 from easybuild.tools.build_log import EasyBuildError

easybuild/easyblocks/e/eigen.py

@@ -19,7 +19,7 @@
 
 import os
 import shutil
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.cmakemake import CMakeMake
 from easybuild.tools.filetools import copy_dir, copy_file, mkdir, apply_regex_substitutions

easybuild/easyblocks/e/elpa.py

@@ -30,7 +30,7 @@
 @author: Kenneth Hoste (Ghent University)
 """
 import os
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.environment as env
 from easybuild.easyblocks.generic.configuremake import ConfigureMake

easybuild/easyblocks/e/esmf.py

@@ -30,7 +30,7 @@
 @author: Maxime Boissonneault (Digital Research Alliance of Canada)
 """
 import os
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.environment as env
 import easybuild.tools.toolchain as toolchain

easybuild/easyblocks/f/ferret.py

@@ -36,7 +36,7 @@
 
 
 import os
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import easybuild.tools.toolchain as toolchain
 from easybuild.easyblocks.generic.configuremake import ConfigureMake
 from easybuild.tools.build_log import EasyBuildError

easybuild/easyblocks/f/fftw.py

@@ -27,7 +27,7 @@
 
 @author: Kenneth Hoste (HPC-UGent)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.toolchain as toolchain
 from easybuild.easyblocks.generic.configuremake import ConfigureMake

easybuild/easyblocks/f/flex.py

@@ -27,7 +27,7 @@
 
 @author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import os
 
 from easybuild.easyblocks.generic.configuremake import ConfigureMake

easybuild/easyblocks/f/fluent.py

@@ -29,7 +29,7 @@
 """
 import os
 import stat
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.framework.easyconfig import CUSTOM

easybuild/easyblocks/f/freesurfer.py

@@ -30,7 +30,7 @@
 
 import os
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.easyblocks.generic.tarball import Tarball
 from easybuild.framework.easyconfig import MANDATORY

easybuild/easyblocks/f/fsl.py

@@ -31,7 +31,7 @@
 import difflib
 import os
 import re
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.environment as env
 from easybuild.framework.easyblock import EasyBlock

easybuild/easyblocks/g/g2clib.py

@@ -40,7 +40,7 @@
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.modules import get_software_root
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 
 class EB_g2clib(ConfigureMake):

easybuild/easyblocks/g/gate.py

@@ -34,7 +34,7 @@
 """
 import os
 import shutil
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.toolchain as toolchain
 from easybuild.easyblocks.generic.cmakemake import CMakeMake

easybuild/easyblocks/g/gcc.py

@@ -39,7 +39,7 @@
 import re
 import shutil
 from copy import copy
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.environment as env
 from easybuild.easyblocks.clang import DEFAULT_TARGETS_MAP as LLVM_ARCH_MAP

easybuild/easyblocks/g/gctf.py

@@ -36,7 +36,7 @@
 from easybuild.tools.filetools import adjust_permissions, copy_file, mkdir
 from easybuild.tools.filetools import symlink, write_file
 from easybuild.tools.modules import get_software_root
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 
 class EB_Gctf(EasyBlock):