[Build System: build-script] Adds a new cache_utils module to build_swift which replaces the existing module from swift_build_support.

utils/build_swift/tests/utils.py

@@ -15,9 +15,11 @@ import platform
 import sys
 import unittest
 
-from six import StringIO
+from build_swift import cache_utils
+from build_swift.versions import Version
 
-from swift_build_support.swift_build_support import cache_util
+import six
+from six import StringIO
 
 
 __all__ = [
@@ -27,6 +29,7 @@ __all__ = [
     'requires_attr',
     'requires_module',
     'requires_platform',
+    'requires_python',
 
     'BUILD_SCRIPT_IMPL_PATH',
     'BUILD_SWIFT_PATH',
@@ -38,6 +41,8 @@ __all__ = [
 # -----------------------------------------------------------------------------
 # Constants
 
+_PYTHON_VERSION = Version(platform.python_version())
+
 TESTS_PATH = os.path.abspath(os.path.dirname(__file__))
 BUILD_SWIFT_PATH = os.path.abspath(os.path.join(TESTS_PATH, os.pardir))
 UTILS_PATH = os.path.abspath(os.path.join(BUILD_SWIFT_PATH, os.pardir))
@@ -124,9 +129,10 @@ class redirect_stdout():
         sys.stderr = self._old_stdout
 
 
-@cache_util.cached
+@cache_utils.cache
 def requires_attr(obj, attr):
-    """
+    """Decorator used to skip tests if an object does not have the required
+    attribute.
     """
 
     try:
@@ -137,7 +143,7 @@ def requires_attr(obj, attr):
             attr, obj))
 
 
-@cache_util.cached
+@cache_utils.cache
 def requires_module(fullname):
     """Decorator used to skip tests if a module is not imported.
     """
@@ -148,7 +154,7 @@ def requires_module(fullname):
     return unittest.skip('Unable to import "{}"'.format(fullname))
 
 
-@cache_util.cached
+@cache_utils.cache
 def requires_platform(name):
     """Decorator used to skip tests if not running on the given platform.
     """
@@ -157,4 +163,20 @@ def requires_platform(name):
         return lambda func: func
 
     return unittest.skip(
-        'Required platform "{}"" does not match system'.format(name))
+        'Required platform "{}" does not match system'.format(name))
+
+
+@cache_utils.cache
+def requires_python(version):
+    """Decorator used to skip tests if the running Python version is not
+    greater or equal to the required version.
+    """
+
+    if isinstance(version, six.string_types):
+        version = Version(version)
+
+    if _PYTHON_VERSION >= version:
+        return lambda func: func
+
+    return unittest.skip(
+        'Requires Python version {} or greater'.format(version))