Use easybuilds LooseVersion

contrib/hooks/add_delete_configopt.py

@@ -3,7 +3,7 @@
 # Author: Åke Sandgren, HPC2N
 
 # We need to be able to distinguish between versions of OpenMPI
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 
 def pre_configure_hook(self, *args, **kwargs):

contrib/hooks/hpc2n_hooks.py

@@ -4,8 +4,8 @@
 
 import os
 
-from distutils.version import LooseVersion
 from easybuild.framework.easyconfig.format.format import DEPENDENCY_PARAMETERS
+from easybuild.tools import LooseVersion
 from easybuild.tools.filetools import apply_regex_substitutions
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.modules import get_software_root

easybuild/base/fancylogger.py

@@ -83,8 +83,8 @@
 import threading
 import traceback
 import weakref
-from distutils.version import LooseVersion
 
+from easybuild.tools import LooseVersion
 from easybuild.tools.py2vs3 import raise_with_traceback, string_type
 
 

easybuild/framework/easyblock.py

@@ -49,7 +49,6 @@
 import time
 import traceback
 from datetime import datetime
-from distutils.version import LooseVersion
 
 import easybuild.tools.environment as env
 import easybuild.tools.toolchain as toolchain
@@ -63,7 +62,7 @@
 from easybuild.framework.easyconfig.tools import dump_env_easyblock, get_paths_for
 from easybuild.framework.easyconfig.templates import TEMPLATE_NAMES_EASYBLOCK_RUN_STEP, template_constant_dict
 from easybuild.framework.extension import Extension, resolve_exts_filter_template
-from easybuild.tools import config, run
+from easybuild.tools import config, LooseVersion, run
 from easybuild.tools.build_details import get_build_stats
 from easybuild.tools.build_log import EasyBuildError, dry_run_msg, dry_run_warning, dry_run_set_dirs
 from easybuild.tools.build_log import print_error, print_msg, print_warning

easybuild/framework/easyconfig/easyconfig.py

@@ -44,7 +44,6 @@
 import functools
 import os
 import re
-from distutils.version import LooseVersion
 from contextlib import contextmanager
 
 import easybuild.tools.filetools as filetools
@@ -60,6 +59,7 @@
 from easybuild.framework.easyconfig.parser import DEPRECATED_PARAMETERS, REPLACED_PARAMETERS
 from easybuild.framework.easyconfig.parser import EasyConfigParser, fetch_parameters_from_easyconfig
 from easybuild.framework.easyconfig.templates import TEMPLATE_CONSTANTS, TEMPLATE_NAMES_DYNAMIC, template_constant_dict
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError, print_warning, print_msg
 from easybuild.tools.config import GENERIC_EASYBLOCK_PKG, LOCAL_VAR_NAMING_CHECK_ERROR, LOCAL_VAR_NAMING_CHECK_LOG
 from easybuild.tools.config import LOCAL_VAR_NAMING_CHECK_WARN

easybuild/framework/easyconfig/format/version.py

@@ -31,7 +31,7 @@
 """
 import operator as op
 import re
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.base import fancylogger
 from easybuild.tools.build_log import EasyBuildError

easybuild/framework/easyconfig/format/yeb.py

@@ -32,11 +32,11 @@
 import copy
 import os
 import platform
-from distutils.version import LooseVersion
 
 from easybuild.base import fancylogger
 from easybuild.framework.easyconfig.format.format import EasyConfigFormat
 from easybuild.framework.easyconfig.format.pyheaderconfigobj import build_easyconfig_constants_dict
+from easybuild.tools import LooseVersion
 from easybuild.tools.py2vs3 import string_type
 from easybuild.tools.utilities import INDENT_4SPACES, only_if_module_is_available, quote_str
 

easybuild/framework/easyconfig/tools.py

@@ -43,7 +43,6 @@
 import re
 import sys
 import tempfile
-from distutils.version import LooseVersion
 
 from easybuild.base import fancylogger
 from easybuild.framework.easyconfig import EASYCONFIGS_PKG_SUBDIR
@@ -52,6 +51,7 @@
 from easybuild.framework.easyconfig.easyconfig import process_easyconfig
 from easybuild.framework.easyconfig.format.yeb import quote_yaml_special_chars
 from easybuild.framework.easyconfig.style import cmdline_easyconfigs_style_check
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError, print_msg, print_warning
 from easybuild.tools.config import build_option
 from easybuild.tools.environment import restore_env

easybuild/framework/easyconfig/tweak.py

@@ -41,7 +41,6 @@
 import os
 import re
 import tempfile
-from distutils.version import LooseVersion
 
 from easybuild.base import fancylogger
 from easybuild.framework.easyconfig.constants import EASYCONFIG_CONSTANTS
@@ -54,6 +53,7 @@
 from easybuild.framework.easyconfig.tools import alt_easyconfig_paths
 from easybuild.toolchains.compiler.systemcompiler import TC_CONSTANT_SYSTEM
 from easybuild.toolchains.gcccore import GCCcore
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError, print_warning
 from easybuild.tools.config import build_option
 from easybuild.tools.filetools import read_file, write_file

easybuild/toolchains/compiler/gcc.py

@@ -30,9 +30,9 @@
 """
 
 import re
-from distutils.version import LooseVersion
 
 import easybuild.tools.systemtools as systemtools
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.modules import get_software_root, get_software_version
 from easybuild.tools.toolchain.compiler import Compiler, DEFAULT_OPT_LEVEL

easybuild/toolchains/compiler/intel_compilers.py

@@ -29,9 +29,8 @@
 """
 import os
 
-from distutils.version import LooseVersion
-
 from easybuild.toolchains.compiler.inteliccifort import IntelIccIfort
+from easybuild.tools import LooseVersion
 from easybuild.tools.toolchain.compiler import Compiler
 
 

easybuild/toolchains/compiler/inteliccifort.py

@@ -29,7 +29,7 @@
 :author: Kenneth Hoste (Ghent University)
 """
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 import easybuild.tools.systemtools as systemtools
 from easybuild.tools.build_log import EasyBuildError

easybuild/toolchains/compiler/pgi.py

@@ -32,9 +32,8 @@
 :author: Damian Alvarez (Forschungszentrum Juelich GmbH)
 """
 
-from distutils.version import LooseVersion
-
 import easybuild.tools.systemtools as systemtools
+from easybuild.tools import LooseVersion
 from easybuild.tools.toolchain.compiler import Compiler
 
 

easybuild/toolchains/fft/fftw.py

@@ -29,7 +29,7 @@
 :author: Kenneth Hoste (Ghent University)
 """
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.toolchain.fft import Fft

easybuild/toolchains/fft/intelfftw.py

@@ -29,8 +29,8 @@
 :author: Kenneth Hoste (Ghent University)
 """
 import os
-from distutils.version import LooseVersion
 
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError, dry_run_warning
 from easybuild.tools.config import build_option
 from easybuild.toolchains.fft.fftw import Fftw

easybuild/toolchains/foss.py

@@ -27,14 +27,13 @@
 
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
-
 from easybuild.toolchains.gompi import Gompi
 from easybuild.toolchains.golf import Golf
 from easybuild.toolchains.fft.fftw import Fftw
 from easybuild.toolchains.linalg.flexiblas import FlexiBLAS
 from easybuild.toolchains.linalg.openblas import OpenBLAS
 from easybuild.toolchains.linalg.scalapack import ScaLAPACK
+from easybuild.tools import LooseVersion
 
 
 class Foss(Gompi, OpenBLAS, FlexiBLAS, ScaLAPACK, Fftw):

easybuild/toolchains/gcc.py

@@ -27,10 +27,10 @@
 
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
 import re
 
 from easybuild.toolchains.gcccore import GCCcore
+from easybuild.tools import LooseVersion
 from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME
 
 

easybuild/toolchains/gcccore.py

@@ -27,10 +27,10 @@
 
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
 import re
 
 from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.tools import LooseVersion
 from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME
 
 

easybuild/toolchains/gcccuda.py

@@ -28,10 +28,10 @@
 :author: Kenneth Hoste (Ghent University)
 """
 import re
-from distutils.version import LooseVersion
 
 from easybuild.toolchains.compiler.cuda import Cuda
 from easybuild.toolchains.gcc import GccToolchain
+from easybuild.tools import LooseVersion
 
 
 class GccCUDA(GccToolchain, Cuda):

easybuild/toolchains/gimpi.py

@@ -29,8 +29,8 @@
 :author: Kenneth Hoste (Ghent University)
 """
 import re
-from distutils.version import LooseVersion
 
+from easybuild.tools import LooseVersion
 from easybuild.toolchains.gcc import GccToolchain
 from easybuild.toolchains.mpi.intelmpi import IntelMPI
 

easybuild/toolchains/gmpit.py

@@ -27,9 +27,9 @@
 
 :author: Alan O'Cais (CECAM)
 """
-from distutils.version import LooseVersion
 import re
 
+from easybuild.tools import LooseVersion
 from easybuild.toolchains.gcc import GccToolchain
 from easybuild.toolchains.mpi.mpitrampoline import MPItrampoline
 

easybuild/toolchains/gompi.py

@@ -27,7 +27,7 @@
 
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import re
 
 from easybuild.toolchains.gcc import GccToolchain

easybuild/toolchains/iccifort.py

@@ -28,11 +28,11 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
 import re
 
 from easybuild.toolchains.compiler.inteliccifort import IntelIccIfort
 from easybuild.toolchains.gcccore import GCCcore
+from easybuild.tools import LooseVersion
 from easybuild.tools.modules import get_software_root, get_software_version
 from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME
 

easybuild/toolchains/iimpi.py

@@ -28,7 +28,7 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import re
 
 from easybuild.toolchains.iccifort import IccIfort

easybuild/toolchains/iimpic.py

@@ -28,8 +28,8 @@
 :author: Ake Sandgren (HPC2N)
 """
 import re
-from distutils.version import LooseVersion
 
+from easybuild.tools import LooseVersion
 from easybuild.toolchains.iccifortcuda import IccIfortCUDA
 from easybuild.toolchains.mpi.intelmpi import IntelMPI
 

easybuild/toolchains/intel.py

@@ -29,13 +29,13 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
 import re
 
 from easybuild.toolchains.iimpi import Iimpi
 from easybuild.toolchains.iimkl import Iimkl
 from easybuild.toolchains.fft.intelfftw import IntelFFTW
 from easybuild.toolchains.linalg.intelmkl import IntelMKL
+from easybuild.tools import LooseVersion
 
 
 class Intel(Iimpi, IntelMKL, IntelFFTW):

easybuild/toolchains/iomkl.py

@@ -29,9 +29,9 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
 import re
 
+from easybuild.tools import LooseVersion
 from easybuild.toolchains.iompi import Iompi
 from easybuild.toolchains.iimkl import Iimkl
 from easybuild.toolchains.fft.intelfftw import IntelFFTW

easybuild/toolchains/iompi.py

@@ -28,7 +28,7 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 import re
 
 from easybuild.toolchains.iccifort import IccIfort

easybuild/toolchains/linalg/acml.py

@@ -30,10 +30,10 @@
 """
 
 import os
-from distutils.version import LooseVersion
 
 from easybuild.toolchains.compiler.inteliccifort import TC_CONSTANT_INTELCOMP
 from easybuild.toolchains.compiler.gcc import TC_CONSTANT_GCC
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.toolchain.linalg import LinAlg
 

easybuild/toolchains/linalg/blis.py

@@ -29,7 +29,7 @@
 :author: Bart Oldeman (McGill University, Calcul Quebec, Compute Canada)
 :author: Sebastian Achilles (Forschungszentrum Juelich GmbH)
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.tools.toolchain.linalg import LinAlg
 

easybuild/toolchains/linalg/intelmkl.py

@@ -29,7 +29,6 @@
 :author: Kenneth Hoste (Ghent University)
 """
 import os
-from distutils.version import LooseVersion
 
 from easybuild.toolchains.compiler.gcc import TC_CONSTANT_GCC
 from easybuild.toolchains.compiler.inteliccifort import TC_CONSTANT_INTELCOMP
@@ -39,6 +38,7 @@
 from easybuild.toolchains.mpi.mpich2 import TC_CONSTANT_MPICH2
 from easybuild.toolchains.mpi.mvapich2 import TC_CONSTANT_MVAPICH2
 from easybuild.toolchains.mpi.openmpi import TC_CONSTANT_OPENMPI
+from easybuild.tools import LooseVersion
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.toolchain.linalg import LinAlg
 

easybuild/toolchains/linalg/scalapack.py

@@ -29,7 +29,7 @@
 :author: Kenneth Hoste (Ghent University)
 """
 
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.toolchains.linalg.blacs import Blacs
 

easybuild/toolchains/mpi/intelmpi.py

@@ -33,8 +33,8 @@
 
 import easybuild.tools.toolchain as toolchain
 
-from distutils.version import LooseVersion
 from easybuild.toolchains.mpi.mpich2 import Mpich2
+from easybuild.tools import LooseVersion
 from easybuild.tools.toolchain.constants import COMPILER_FLAGS, COMPILER_VARIABLES
 from easybuild.tools.toolchain.variables import CommandFlagList
 

easybuild/toolchains/mpi/mpich.py

@@ -30,7 +30,7 @@
 :author: Jens Timmerman (Ghent University)
 :author: Dmitri Gribenko (National Technical University of Ukraine "KPI")
 """
-from distutils.version import LooseVersion
+from easybuild.tools import LooseVersion
 
 from easybuild.tools.toolchain.constants import COMPILER_VARIABLES, MPI_COMPILER_VARIABLES
 from easybuild.tools.toolchain.mpi import Mpi