From b101c7da8fabfd3869fb893c5ba1d06e93130290 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Mon, 6 Nov 2017 19:38:41 +0800
Subject: [PATCH] print PyUnitReport version

---
 ate/cli.py | 10 ++++++----
 setup.py   |  9 ++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ate/cli.py b/ate/cli.py
index decb80f1..0f1620ab 100644
--- a/ate/cli.py
+++ b/ate/cli.py
@@ -4,12 +4,13 @@ import os
 import sys
 from collections import OrderedDict
 
-from ate import __version__, exception
+import PyUnitReport
+from PyUnitReport import __version__ as pyu_version
+from ate import __version__ as ate_version
+from ate import exception
 from ate.task import TaskSuite
 from ate.utils import create_scaffold
 
-import PyUnitReport
-
 
 def main_ate():
     """ API test: parse command line options and run commands.
@@ -38,7 +39,8 @@ def main_ate():
     args = parser.parse_args()
 
     if args.version:
-        print("HttpRunner version: {}".format(__version__))
+        print("HttpRunner version: {}".format(ate_version))
+        print("PyUnitReport version: {}".format(pyu_version))
         exit(0)
 
     log_level = getattr(logging, args.log_level.upper())
diff --git a/setup.py b/setup.py
index 199faaa6..264b6616 100644
--- a/setup.py
+++ b/setup.py
@@ -1,20 +1,15 @@
 #encoding: utf-8
 import io
-import os
-import re
 
+from ate import __version__
 from setuptools import find_packages, setup
 
-# parse version from ate/__init__.py
-with open(os.path.join(os.path.dirname(__file__), 'ate', '__init__.py')) as f:
-    version = re.compile(r"__version__\s+=\s+'(.*)'", re.I).match(f.read()).group(1)
-
 with io.open("README.md", encoding='utf-8') as f:
     long_description = f.read()
 
 setup(
     name='HttpRunner',
-    version=version,
+    version=__version__,
     description='HTTP test runner, not just about api test and load test.',
     long_description=long_description,
     author='Leo Lee',