summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2017-04-19 03:00:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-19 03:00:23 +0000
commit2781bdb0a4d3802719f4dc6f862bb7e8cfbaed41 (patch)
treeb3f808831ab344b3ad678db5a41978b7f63ee367
parentb40f4ca8366037551d17ce93f892caba464f9bc0 (diff)
parent2589625ff30b794f6a427e040c0287205311dec5 (diff)
Merge "Add E release development version."
-rw-r--r--qtip/cli/entry.py3
-rw-r--r--setup.cfg1
-rw-r--r--tests/unit/cli/options_test.py3
3 files changed, 5 insertions, 2 deletions
diff --git a/qtip/cli/entry.py b/qtip/cli/entry.py
index 6cf78b58..b84a03d0 100644
--- a/qtip/cli/entry.py
+++ b/qtip/cli/entry.py
@@ -9,6 +9,7 @@
import click
import os
+import pkg_resources as pkg
import sys
@@ -53,7 +54,7 @@ class QtipCli(click.MultiCommand):
invoke_without_command=True)
@click.option('-v', '--verbose', is_flag=True, help='Enable verbose mode.')
@click.option('-d', '--debug', is_flag=True, help='Enable debug mode.')
-@click.version_option('dev')
+@click.version_option(pkg.require("qtip")[0])
@pass_context
def cli(ctx, verbose, debug):
if debug:
diff --git a/setup.cfg b/setup.cfg
index 23103fc5..71b8c8fd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,6 @@
[metadata]
name = qtip
+version = 5.0.0
summary = Platform Performance Benchmarking
description-file =
README.md
diff --git a/tests/unit/cli/options_test.py b/tests/unit/cli/options_test.py
index 9dbbe6f3..d7c0f700 100644
--- a/tests/unit/cli/options_test.py
+++ b/tests/unit/cli/options_test.py
@@ -8,6 +8,7 @@
##############################################################################
import pytest
+import re
import sys
from click.testing import CliRunner
@@ -26,7 +27,7 @@ class TestClass(object):
def test_version(self, runner):
result = runner.invoke(cli, ['--version'])
- assert 'dev' in result.output
+ assert re.search(r'\d+\.\d+\.\d+', result.output)
def test_debug(self, runner):
runner.invoke(cli, ['-d'])