Define version once per package only

diff --git a/linuxautomaton/setup.py b/linuxautomaton/setup.py
index 3119d7257fcf6626fda87d753ccffcf824c44ea3..488ee24d5339451fc6a95e2a4235c0a16cbe28d9 100755 (executable)
--- a/linuxautomaton/setup.py
+++ b/linuxautomaton/setup.py
@@ -39,8 +39,10 @@ packages = [
 install_requires = [
 ]
 
+from linuxautomaton import __version__
+
 setup(name='linuxautomaton',
-      version='0.2.0',
+      version=__version__,
       description='Linux kernel FSM using LTTng events',
       author='Julien Desfossez',
       author_email='jdesfossez@efficios.com',

diff --git a/lttnganalyses/setup.py b/lttnganalyses/setup.py
index feb6675420bcadc1337472f5c54022c36895cdc4..523724026c19e7b3246a5e8866d8fcfe358eb567 100755 (executable)
--- a/lttnganalyses/setup.py
+++ b/lttnganalyses/setup.py
@@ -40,8 +40,10 @@ install_requires = [
     'linuxautomaton',
 ]
 
+from lttnganalyses import __version__
+
 setup(name='lttnganalyses',
-      version='0.2.0',
+      version=__version__,
       description='LTTng analyses',
       author='Julien Desfossez',
       author_email='jdesfossez@efficios.com',

diff --git a/lttnganalysescli/lttnganalysescli/command.py b/lttnganalysescli/lttnganalysescli/command.py
index 31a58c4129f677d29cfa2ac36b2ebd202556cee0..c0168e1f7d8b7f84a1500c7a2e190a30e653d686 100644 (file)
--- a/lttnganalysescli/lttnganalysescli/command.py
+++ b/lttnganalysescli/lttnganalysescli/command.py
@@ -23,7 +23,7 @@
 # SOFTWARE.
 
 import linuxautomaton.automaton
-from lttnganalysescli import progressbar
+from lttnganalysescli import progressbar, __version__
 from linuxautomaton import common
 from babeltrace import TraceCollection
 import argparse
@@ -262,7 +262,7 @@ class Command:
 
         # version of the specific command
         ap.add_argument('-V', '--version', action='version',
-                        version=self._VERSION)
+                        version='LTTng Analyses v' + __version__)
 
         # parse arguments
         args = ap.parse_args()

diff --git a/lttnganalysescli/lttnganalysescli/cputop.py b/lttnganalysescli/lttnganalysescli/cputop.py
index 1d52dac062ce88153a602b9c0a154e1e68f785e0..2c34bd64cc0194ec3cf7af8fecdd8a1810c7d48e 100644 (file)
--- a/lttnganalysescli/lttnganalysescli/cputop.py
+++ b/lttnganalysescli/lttnganalysescli/cputop.py
@@ -30,7 +30,6 @@ import operator
 
 
 class Cputop(Command):
-    _VERSION = '0.2.0'
     _DESC = """The cputop command."""
 
     def __init__(self):

diff --git a/lttnganalysescli/lttnganalysescli/io.py b/lttnganalysescli/lttnganalysescli/io.py
index fd6dd38ae0b7916262b94b4bf374e34b70e98a30..04304810d125fe5d7aec438b49b51de46dac091e 100644 (file)
--- a/lttnganalysescli/lttnganalysescli/io.py
+++ b/lttnganalysescli/lttnganalysescli/io.py
@@ -32,7 +32,6 @@ import statistics
 
 
 class IoAnalysisCommand(Command):
-    _VERSION = '0.2.0'
     _DESC = """The I/O command."""
 
     _LATENCY_STATS_FORMAT = '{:<14} {:>14} {:>14} {:>14} {:>14} {:>14}'

diff --git a/lttnganalysescli/lttnganalysescli/irq.py b/lttnganalysescli/lttnganalysescli/irq.py
index a19398ce87829dd1e6601d233207b5a04facdce5..a2231ef0529ee48e846cea8212e77f831d73a53c 100644 (file)
--- a/lttnganalysescli/lttnganalysescli/irq.py
+++ b/lttnganalysescli/lttnganalysescli/irq.py
@@ -32,7 +32,6 @@ import statistics
 
 
 class IrqAnalysisCommand(Command):
-    _VERSION = '0.2.0'
     _DESC = """The irq command."""
 
     def __init__(self):

diff --git a/lttnganalysescli/lttnganalysescli/memtop.py b/lttnganalysescli/lttnganalysescli/memtop.py
index dc42ad228cdee2ddb26d4533ae69c898ddbe5262..e1dca5c6a285b7c591632281005da1e5b1333064 100644 (file)
--- a/lttnganalysescli/lttnganalysescli/memtop.py
+++ b/lttnganalysescli/lttnganalysescli/memtop.py
@@ -31,7 +31,6 @@ import operator
 
 
 class Memtop(Command):
-    _VERSION = '0.2.0'
     _DESC = """The memtop command."""
 
     def __init__(self):

diff --git a/lttnganalysescli/lttnganalysescli/syscallstats.py b/lttnganalysescli/lttnganalysescli/syscallstats.py
index a67b8c22e42f390ff42857816692cfeaa87b6a11..df2d8947f712649b4c189ae1fadba8fd073ce670 100644 (file)
--- a/lttnganalysescli/lttnganalysescli/syscallstats.py
+++ b/lttnganalysescli/lttnganalysescli/syscallstats.py
@@ -31,7 +31,6 @@ import errno
 
 
 class SyscallsAnalysis(Command):
-    _VERSION = '0.2.0'
     _DESC = """The syscallstats command."""
 
     def __init__(self):

diff --git a/lttnganalysescli/setup.py b/lttnganalysescli/setup.py
index adfa5667d7e83a113f02c24d61f30f3c1db427e2..5994b02b2321ccd32cc5585bf09953a70c47d319 100755 (executable)
--- a/lttnganalysescli/setup.py
+++ b/lttnganalysescli/setup.py
@@ -58,8 +58,10 @@ entry_points = {
     ],
 }
 
+from lttnganalysescli import __version__
+
 setup(name='lttnganalysescli',
-      version='0.2.0',
+      version=__version__,
       description='LTTng analyses CLI',
       author='Julien Desfossez',
       author_email='jdesfossez@efficios.com',