intermediate changes

ref:44cfacf4cc6e35eb3189b83a81fde1f7844d175b

4 files changed, 7 insertions, 4 deletions

diff --git a/library/python/pytest/plugins/ya.py b/library/python/pytest/plugins/ya.py
index 1f1bf4cb59..d85c391435 100644
--- a/library/python/pytest/plugins/ya.py
+++ b/library/python/pytest/plugins/ya.py
@@ -81,6 +81,9 @@ class CustomImporter(object):
     def __init__(self, roots):
         self._roots = roots
 
+    def find_spec(self, fullname, path, target=None):
+        return None
+
     def find_module(self, fullname, package_path=None):
         for path in self._roots:
             full_path = self._get_module_path(path, fullname)
diff --git a/library/python/testing/yatest_common/ya.make b/library/python/testing/yatest_common/ya.make
index 5662db4c5d..f7a566ca9d 100644
--- a/library/python/testing/yatest_common/ya.make
+++ b/library/python/testing/yatest_common/ya.make
@@ -26,6 +26,7 @@ PY_SRCS(
 
 PEERDIR(
     contrib/python/six
+    contrib/python/packaging
     library/python/cores
     library/python/filelock
     library/python/fs
diff --git a/library/python/testing/yatest_common/yatest/common/process.py b/library/python/testing/yatest_common/yatest/common/process.py
index bed0db1e1d..1a08bb98d3 100644
--- a/library/python/testing/yatest_common/yatest/common/process.py
+++ b/library/python/testing/yatest_common/yatest/common/process.py
@@ -10,7 +10,7 @@ import logging
 import tempfile
 import subprocess
 import errno
-import distutils.version
+import packaging.version
 
 import six
 
@@ -721,13 +721,13 @@ def _run_readelf(binary_path):
 
 
 def check_glibc_version(binary_path):
-    lucid_glibc_version = distutils.version.LooseVersion("2.11")
+    lucid_glibc_version = packaging.version.parse("2.11")
 
     for l in _run_readelf(binary_path).split('\n'):
         match = GLIBC_PATTERN.search(l)
         if not match:
             continue
-        assert distutils.version.LooseVersion(match.group(1)) <= lucid_glibc_version, match.group(0)
+        assert packaging.version.parse(match.group(1)) <= lucid_glibc_version, match.group(0)
 
 
 def backtrace_to_html(bt_filename, output):
diff --git a/library/python/testing/yatest_common/yatest/common/ya.make b/library/python/testing/yatest_common/yatest/common/ya.make
deleted file mode 100644
index f7c50dfe64..0000000000
--- a/library/python/testing/yatest_common/yatest/common/ya.make
+++ /dev/null
@@ -1 +0,0 @@
-OWNER(g:yatest)