Finish 2.2.0

thegrill · Feb 16, 2021 · 0799c6a · 0799c6a
2 parents f0dbd41 + b322c25
commit 0799c6a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -92,9 +92,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = '2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/grill/tokens/ids/CGAsset.cfg b/grill/tokens/ids/CGAsset.cfg
@@ -40,7 +40,7 @@ description = Inner process of the current `area` during the life cycle of a con
 
 [variant]
 short_name = v
-default = root
+default = base
 description = Variation expressing a different intent of the current `item` (e.g. 'wet', 'optionB', 'grayscale').
 
 [part]

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = grill-names
-version = 2.1.0
+version = 2.2.0
 description = Name objects for digital content creation.
 long_description = file: README.md
 long_description_content_type = text/markdown

diff --git a/tests/test_names.py b/tests/test_names.py
@@ -12,26 +12,26 @@ def test_cgasset_file(self):
         self.assertEqual(name.area, 'model')
         path = Path.joinpath(
             Path(),
-            'demo', '3d', 'abc', 'entity', 'model', 'main', 'atom', 'lead', 'root',
-            'whole', '1', 'demo-3d-abc-entity-model-main-atom-lead-root-whole.1.ext'
+            'demo', '3d', 'abc', 'entity', 'model', 'main', 'atom', 'lead', 'base',
+            'whole', '1', 'demo-3d-abc-entity-model-main-atom-lead-base-whole.1.ext'
         )
         self.assertEqual(Path(path), name.path)
         name.sep = ':'
         self.assertEqual(':', name.sep)
-        self.assertEqual('demo:3d:abc:entity:model:main:atom:lead:root:whole.1.ext', name.get())
+        self.assertEqual('demo:3d:abc:entity:model:main:atom:lead:base:whole.1.ext', name.get())
         name.sep = '.'
         self.assertEqual(name.sep, '.')
-        self.assertEqual('demo.3d.abc.entity.model.main.atom.lead.root.whole.1.ext', name.get())
+        self.assertEqual('demo.3d.abc.entity.model.main.atom.lead.base.whole.1.ext', name.get())
         name.sep = ' '
         name.name = name.get(area='rig', part='leg', output='skin', stream='dev')
         self.assertEqual('rig', name.area)
-        self.assertEqual('demo 3d abc entity rig dev atom lead root leg.skin.1.ext', name.get())
+        self.assertEqual('demo 3d abc entity rig dev atom lead base leg.skin.1.ext', name.get())
 
     def test_cgasset(self):
         self.assertEqual(CGAsset().get(),
                          '{code}-{media}-{kingdom}-{cluster}-{area}-{stream}-{item}-{step}-{variant}-{part}')
         self.assertEqual(CGAsset.get_default().name,
-                         'demo-3d-abc-entity-rnd-main-atom-lead-root-whole')
+                         'demo-3d-abc-entity-rnd-main-atom-lead-base-whole')
 
     def test_lifetr(self):
         domain = 'Eukarya'