summaryrefslogtreecommitdiff
path: root/morphlib/defaults.py
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-12-07 15:02:21 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-03-25 20:57:32 +0000
commit9404317020ff0455cbfd3ca7976d546af823759b (patch)
tree75bf789db3643366f17fd78434f8a85512aa6756 /morphlib/defaults.py
parent575c40c7c28bca4ff18979b6e1b76d5cdfa9841f (diff)
downloadmorph-9404317020ff0455cbfd3ca7976d546af823759b.tar.gz
Remove support for definitions version 6
Change-Id: I603b5172902b5249874ea3bb90de59db5a908185
Diffstat (limited to 'morphlib/defaults.py')
-rw-r--r--morphlib/defaults.py28
1 files changed, 2 insertions, 26 deletions
diff --git a/morphlib/defaults.py b/morphlib/defaults.py
index 9e695a90..85c8b711 100644
--- a/morphlib/defaults.py
+++ b/morphlib/defaults.py
@@ -27,13 +27,6 @@ import morphlib
class Defaults(object):
'''Represents predefined default values specific to Baserock definitions.
- The DEFAULTS file was added in definitions format version 7, which lets
- users set these defaults. The text of DEFAULTS file can be passed in as
- 'text', and will be validated and parsed if definitions_version >= 7.
-
- Prior to version 7, the defaults were hardcoded in Morph. These defaults
- will be returned if definitions_version < 7.
-
'''
def __init__(self, definitions_version, text=None):
self._build_systems = {}
@@ -44,11 +37,8 @@ class Defaults(object):
with open(schema_path) as f:
self.schema = yaml.load(f)
- if definitions_version >= 7:
- if text:
- self._build_systems, self._split_rules = self._parse(text)
- else:
- self._build_systems, self._split_rules = self._builtins()
+ if text:
+ self._build_systems, self._split_rules = self._parse(text)
def _parse(self, text):
build_systems = {}
@@ -87,20 +77,6 @@ class Defaults(object):
return build_systems, split_rules
- def _builtins(self):
- build_systems = {}
- split_rules = {}
-
- for build_system in morphlib.buildsystem.build_systems:
- build_systems[build_system.name] = build_system
-
- split_rules['chunk'] = \
- morphlib.artifactsplitrule.DEFAULT_CHUNK_RULES
- split_rules['stratum'] = \
- morphlib.artifactsplitrule.DEFAULT_STRATUM_RULES
-
- return build_systems, split_rules
-
def build_systems(self):
return self._build_systems