Implement changes for ADR034 and 035.

Signed-off-by: Tobias Wolf <wolf@b1-systems.de>
On-behalf-of: <tobias.wolf@sap.com>

Author: NotTheEvilOne

pyproject.toml

@@ -45,7 +45,6 @@ sphinxcontrib-autoprogram = "^0.1.8"
 sphinx-markdown-builder = "^0.6.10"
 
 [tool.poetry.scripts]
-gl-cname = "gardenlinux.features.cname_main:main"
 gl-feature-fs-diff = "gardenlinux.features.reproducibility.__main__:main"
 gl-features-parse = "gardenlinux.features.__main__:main"
 gl-flavors-parse = "gardenlinux.flavors.__main__:main"

src/gardenlinux/constants.py

@@ -4,9 +4,9 @@
 ARCHS = ["amd64", "arm64"]
 
 # GardenLinux "bare" feature
-BARE_FLAVOR_FEATURE_CONTENT = {"description": "Bare flavor", "type": "platform"}
+BARE_CNAME_FEATURE_CONTENT = {"description": "Bare flavor", "type": "platform"}
 
-BARE_FLAVOR_LIBC_FEATURE_CONTENT = {
+BARE_CNAME_LIBC_FEATURE_CONTENT = {
     "description": "Bare libc feature",
     "type": "element",
 }
@@ -147,6 +147,7 @@
 
 GL_BUG_REPORT_URL = "https://github.com/gardenlinux/gardenlinux/issues"
 GL_COMMIT_SPECIAL_VALUES = ("local",)
+GL_VERSION_SPECIAL_VALUES = ("today",)
 GL_CONTAINER_REGISTRY_BASE_URL = "ghcr.io/gardenlinux/gardenlinux"
 GL_DEB_REPO_BASE_URL = "https://packages.gardenlinux.io/gardenlinux"
 GL_DISTRIBUTION_NAME = "Garden Linux"

src/gardenlinux/features/__init__.py

@@ -4,7 +4,10 @@
 Features module
 """
 
-from .cname import CName
+from .artifact_base_name import ArtifactBaseName
+from .c_name import CName
+from .flavor import Flavor
 from .parser import Parser
+from .versioned_flavor import VersionedFlavor
 
-__all__ = ["CName", "Parser"]
+__all__ = ["ArtifactBaseName", "CName", "Flavor", "Parser", "VersionedFlavor"]