Merge branch 'master' into feature/windows

.codebeatignore

@@ -0,0 +1,2 @@
+src/blade/pathlib.py
+src/blade/version.py

.gitignore

@@ -12,4 +12,4 @@ build64_*
 /blade.zip
 
 /.coverage*
-
+__pycache__

src/blade/cc_targets.py

@@ -17,12 +17,6 @@
 import os
 from string import Template
 
-try:
-    from packaging.version import parse as version_parse
-except ImportError:
-    from distutils.version import LooseVersion as version_parse
-
-
 from blade import build_manager
 from blade import build_rules
 from blade import config
@@ -37,6 +31,7 @@
     stable_unique,
     var_to_list,
     var_to_list_or_none)
+from blade.version import LooseVersion as version_parse
 
 
 # See https://gcc.gnu.org/onlinedocs/gcc/Overall-Options.html#Overall-Options

src/blade/java_targets.py

@@ -16,7 +16,6 @@
 import collections
 import os
 import re
-from distutils.version import LooseVersion
 
 from blade import build_manager
 from blade import build_rules
@@ -25,6 +24,7 @@
 from blade.target import Target, LOCATION_RE
 from blade.util import var_to_list
 from blade.util import iteritems
+from blade.version import LooseVersion
 
 
 class MavenJar(Target):