Merge pull request #45 from jnhyperion/master

Fix lib dependency and version

Author: elrandira

JSONLibrary/JSONLibraryKeywords.py

@@ -4,15 +4,13 @@
 import os.path
 from robot.api import logger
 from robot.api.deco import keyword
-from robot.utils.asserts import assert_true, fail
+from robot.utils.asserts import fail
 from jsonpath_ng import Index, Fields
 from jsonpath_ng.ext import parse as parse_ng
 from jsonpath_ng.exceptions import JsonPathParserError
-from .version import VERSION
 
 __author__ = 'Traitanit Huangsri'
 __email__ = 'traitanit.hua@gmail.com'
-__version__ = VERSION
 
 def parse(json_path):
     try:

JSONLibrary/__init__.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 from .JSONLibraryKeywords import JSONLibraryKeywords
-from .version import VERSION
+from .__version__ import __version__
 
 __author__ = 'Traitanit Huangsri'
 __email__ = 'traitanit.hua@gmail.com'
-__version__ = VERSION
 
 
 class JSONLibrary(JSONLibraryKeywords):

JSONLibrary/version.py renamed to JSONLibrary/__version__.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-VERSION = "0.4.1"
+__version__ = "0.4.1"

setup.py

@@ -1,21 +1,15 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import re
+import os
 from setuptools import setup
 
-# Read version from file without loading the module
-with open('JSONLibrary/version.py', 'r') as version_file:
-    version_match = re.search(r"^VERSION ?= ?['\"]([^'\"]*)['\"]",
-                              version_file.read(), re.M)
-if version_match:
-    VERSION=version_match.group(1)
-else:
-    VERSION='0.1' #
+HERE = os.path.abspath(os.path.dirname(__file__))
+version = {}
+with open(os.path.join(HERE, "JSONLibrary", "__version__.py"), encoding="utf8") as f:
+    exec(f.read(), version)
 
 requirements = [
-#    'tox>=3.0.0',
-    'coverage>=4.2',
     'robotframework>=3.0',
     'jsonpath-ng>=1.4.3'
 ]
@@ -35,7 +29,7 @@
 
 setup(
     name='robotframework-jsonlibrary',
-    version=VERSION,
+    version=version["__version__"],
     description="robotframework-jsonlibrary is a Robot Framework test library for manipulating JSON Object. You can manipulate your JSON object using JSONPath",
     author="Traitanit Huangsri",
     author_email='traitanit.hua@gmail.com',