fixed compatibility work

lib/spack/spack/architecture.py

@@ -90,7 +90,6 @@
 from spack.util.environment import get_path
 from spack.util.multiproc import parmap
 import spack.error as serr
-import spack.platforms
 
 class InvalidSysTypeError(serr.SpackError):
     def __init__(self, sys_type):
@@ -464,8 +463,8 @@ def arch_from_dict(d):
 
     if isinstance(d, basestring):
         # We have an old spec using a string for the architecture
-        arch.platform = spack.platforms.spack_compatibility.SpackCompatibility()
+        arch.platform = Platform('spack_compatibility')
-        arch.platform_os = arch.platform.operating_system('default')
+        arch.platform_os = OperatingSystem('pre_version', '1.0')
         arch.target = Target(d)
 
         arch.os_string = None

lib/spack/spack/operating_systems/pre_v1.py

@@ -1,17 +0,0 @@
-import re
-import os
-
-from spack.architecture import OperatingSystem
-
-
-class PreV1(OperatingSystem):
-    """ Compute Node Linux (CNL) is the operating system used for the Cray XC
-    series super computers. It is a very stripped down version of GNU/Linux.
-    Any compilers found through this operating system will be used with
-    modules. If updated, user must make sure that version and name are 
-    updated to indicate that OS has been upgraded (or downgraded)
-    """
-    def __init__(self):
-        name = 'PreVersion1.0'
-        version = '1.0'
-        super(PreV1, self).__init__(name, version)

lib/spack/spack/platforms/spack_compatibility.py

@@ -1,23 +0,0 @@
-import subprocess
-from spack.architecture import Platform
-from spack.operating_systems.pre_v1
-
-class SpackCompatibility(Platform):
-    priority    = 9999
-
-    # We don't use the normal target getters for this platform
-    # Instead, targets are added directly when parsing the yaml
-
-    # OS is the spack backwards compatibility os.
-    front_os = 'PreVersion1.0'
-    back_os = 'PreVersion1.0'
-    default_os = 'PreVersion1.0'
-
-    def __init__(self):
-        super(SpackCompatibility, self).__init__('spack_compatibility')
-        sc_os = spack.operating_systems.pre_v1.PreV1()
-        self.add_operating_system(sc_os.name, sc_os)
-
-    @classmethod
-    def detect(self):
-        return True