From 1d3b354e4f279ec1de7168762180c0409aafc526 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 24 Sep 2020 16:01:25 -0400 Subject: [PATCH] barectf: add pre-release version information (`barectf.__pre_version__`) This makes it possible to make a `-dev` or `-pre` version for example. `barectf.__version__` contains the pre-release information. The generated metadata stream gets a new `tracer_pre` environment entry set to this value (empty string as of this patch). Signed-off-by: Philippe Proulx --- barectf/__init__.py | 1 + barectf/config.py | 1 + barectf/version.py | 3 ++- tests/tracing/conftest.py | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/barectf/__init__.py b/barectf/__init__.py index c8a8766..533e96a 100644 --- a/barectf/__init__.py +++ b/barectf/__init__.py @@ -33,6 +33,7 @@ import barectf.typing as barectf_typing __major_version__ = barectf_version.__major_version__ __minor_version__ = barectf_version.__minor_version__ __patch_version__ = barectf_version.__patch_version__ +__pre_version__ = barectf_version.__pre_version__ __version__ = barectf_version.__version__ diff --git a/barectf/config.py b/barectf/config.py index 3983f90..7f454a1 100644 --- a/barectf/config.py +++ b/barectf/config.py @@ -797,6 +797,7 @@ class Trace: ('tracer_major', barectf_version.__major_version__), ('tracer_minor', barectf_version.__minor_version__), ('tracer_patch', barectf_version.__patch_version__), + ('tracer_pre', barectf_version.__pre_version__), ('barectf_gen_date', str(datetime.datetime.now().isoformat())), ]) diff --git a/barectf/version.py b/barectf/version.py index f4bdd42..a899b86 100644 --- a/barectf/version.py +++ b/barectf/version.py @@ -24,4 +24,5 @@ __major_version__ = 2 __minor_version__ = 3 __patch_version__ = 1 -__version__ = '{}.{}.{}'.format(__major_version__, __minor_version__, __patch_version__) +__pre_version__ = '' +__version__ = f'{__major_version__}.{__minor_version__}.{__patch_version__}{__pre_version__}' diff --git a/tests/tracing/conftest.py b/tests/tracing/conftest.py index 4477b7e..bc5930f 100644 --- a/tests/tracing/conftest.py +++ b/tests/tracing/conftest.py @@ -133,6 +133,7 @@ class _YamlItem(pytest.Item): 'tracer_major =', 'tracer_minor =', 'tracer_patch =', + 'tracer_pre =', ] for line in lines: -- 2.34.1