Merge pull request #70 from tsbxmw/dev-2.2.0

update readme & config
hautof · Jan 3, 2019 · 86463a1 · 86463a1
2 parents 77c2012 + b12b162
commit 86463a1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -6,10 +6,13 @@
 [![Documentation Status](https://readthedocs.org/projects/haf/badge/?version=latest)](https://haf.readthedocs.io/en/latest/?badge=latest)
 
 
-### new features
+![report](https://raw.githubusercontent.com/tsbxmw/haf/master/docs/show/report.gif)
+![all](https://raw.githubusercontent.com/tsbxmw/haf/master/docs/show/all.gif)
 
 
-- based on local test runner 
+### new features
+
+- based on local test runners 
 
 - support xlsx,json,yml,py cases
 
@@ -21,10 +24,8 @@
 
 - web-server support restful api based on flask
 
-- only mode : loader/runner/recorder/webserver/bus support
+- only mode : loader/runner/recorder/webserver/bus/logger support
 
-![report](https://raw.githubusercontent.com/tsbxmw/haf/master/docs/show/report.gif)
-![all](https://raw.githubusercontent.com/tsbxmw/haf/master/docs/show/all.gif)
 
 ### How to get it
 
@@ -56,9 +57,10 @@
 ```json
     {
       "config":{
+        "name": "test",
         "run": {
           "log": {
-            "log_path": "D:/workspace/mine/python/haf/data"
+            "log_path": "./data"
           },
           "bus": {
             "only": false,
@@ -67,20 +69,20 @@
             "auth_key": ""
           },
           "report": {
-            "report_path": "D:/workspace/mine/python/haf/data/report.html"
+            "report_path": "./data/report.html"
           },
           "case": [
             {
-              "case_path": "D:/workspace/mine/python/haf/testcases/test.xlsx"
+              "case_path": "./testcases/test.xlsx"
             },
             {
-              "case_path": "D:/workspace/mine/python/haf/testcases/test2.json"
+              "case_path": "./testcases/test2.json"
             },
             {
-              "case_path": "D:/workspace/mine/python/haf/testcases/test1.xlsx"
+              "case_path": "./testcases/test1.xlsx"
             },
             {
-              "case_path": "D:/workspace/mine/python/haf/testcases/test3.yml"
+              "case_path": "./testcases/test3.yml"
             }
           ],
           "runner":{
@@ -106,7 +108,7 @@
 
 ##### create testcase
 
-- create xlsx/json/yml file with template in testcases/
+- create xlsx/json/yml/py file with template in testcases/
 
 ##### run
 
@@ -185,7 +187,7 @@
 
 > [doc url](https://github.com/tsbxmw/haf/blob/master/docs/design.md)
 
-> [read the doc](https://haf-doc.readthedocs.io/en/dev-2.1.0/)
+> [read the doc](https://haf-doc.readthedocs.io/en/dev-2.2.0/)
 
 > [wiki home](https://github.com/tsbxmw/haf/wiki)
 

diff --git a/docs/releasenote.md b/docs/releasenote.md
@@ -1,3 +1,12 @@
+> version 2.2rc2
+
+- add name support
+
+> version 2.2rc1
+
+- fix some bugs
+- update report template
+
 > version 2.2.b
 
 - add new reprot html template

diff --git a/haf/config.py b/haf/config.py
@@ -57,7 +57,7 @@
 
 MAIN_VERSION = 2
 SUB_VERSION = 2
-FIX_VERSION = 'c'
+FIX_VERSION = 'c2'
 VERSION_TYPE = "dev"
 PLATFORM_VERSION = f"{VERSION_TYPE}-{MAIN_VERSION}.{SUB_VERSION}.{FIX_VERSION}"
 
@@ -67,7 +67,7 @@
 (  )) | |__| |/ ___ \___| |___  
  \\\\/  |  __  || |__\ \__  ____| 
   '   | |  | ||_____\_\ | |   
-      |_|  |_| v{MAIN_VERSION}.{SUB_VERSION}.{FIX_VERSION}   |_|   
+      |_|  |_| v{MAIN_VERSION}.{SUB_VERSION}.{FIX_VERSION}  |_|   
 """
 
 BANNER_STRS_EXIT = f"""
@@ -76,5 +76,5 @@
 (  )) | |__| |/ ___ \___| |___  
  \\\\/  |  __  || |__\ \__  ____| 
   '   | |  | ||_____\_\ | |   
-      |_|  |_| v{MAIN_VERSION}.{SUB_VERSION}.{FIX_VERSION}   |_|       EXIT ...
+      |_|  |_| v{MAIN_VERSION}.{SUB_VERSION}.{FIX_VERSION}  |_|       EXIT ...
 """
diff --git a/setup.py b/setup.py
@@ -5,7 +5,6 @@
 PACKAGE_NAME = "haf"
 
 requires = [
-    'paramiko',
     'requests',
     'openpyxl',
     'pymysql',