Merge pull request #2 from chilispa/fixed-setup

Fixed import of redis in setup.py

.travis.yml

@@ -1,8 +1,8 @@
 language: python
 python:
   - "3.6"
-install: "pip install -r requirements.txt"
-script: make clean coverage docs dist
+install: "pip install ."
+script: make clean test coverage docs dist
 deploy:
   provider: pypi
   user: nottyo

Makefile

@@ -51,6 +51,7 @@ test: ## run tests quickly with the default Python
 		python setup.py test
 
 coverage: ## check code coverage quickly with the default Python
+		pip install coverage
 		coverage run --source RedisLibrary setup.py test
 		coverage report -m
 		coverage html

RedisLibrary/RedisLibraryKeywords.py

@@ -1,18 +1,16 @@
 # -*- coding: utf-8 -*-
 from robot.api import logger
 from robot.api.deco import keyword
-from .version import VERSION
 import redis
 
 __author__ = 'Traitanit Huangsri'
 __email__ = '[email protected]'
-__version__ = VERSION
 
 
 class RedisLibraryKeywords(object):
 
     @keyword('Connect To Redis')
-    def connect_to_redis(self, redis_host, redis_port=6379, db=0): # pragma: no cover
+    def connect_to_redis(self, redis_host, redis_port=6379, db=0):  # pragma: no cover
         """Connect to the Redis server.
 
         Arguments:
@@ -166,7 +164,5 @@ def check_if_key_exits(self, redis_conn, key):
         | ${is_exist}= | Check If Key Exists | ${redis_conn} | BARCODE|1234567890 |
         """
         if redis_conn.exists(key) is False:
-            logger.error("Key " + key +" doesn't exist in Redis.")
+            logger.error("Key " + key + " doesn't exist in Redis.")
             raise AssertionError
-
-

RedisLibrary/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
+import pkg_resources  # part of setuptools
 from .RedisLibraryKeywords import RedisLibraryKeywords
-from .version import VERSION
 
 __author__ = 'Traitanit Huangsri'
 __email__ = '[email protected]'
-__version__ = VERSION
+__version__ = pkg_resources.require("robotframework-redislibrary")[0].version
 
 
 class RedisLibrary(RedisLibraryKeywords):

VERSION

@@ -0,0 +1 @@
+0.3

requirements.txt

@@ -1,5 +1,2 @@
 robotframework>=3.0
-coverage
-tox
-fakeredis==0.8.2
-redis==2.10.5
+redis>=2.10.5

setup.cfg

@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.md
+description-file = README.md

setup.py

@@ -1,17 +1,25 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import os
 from setuptools import setup
-from RedisLibrary.version import VERSION
 
-requirements = [
-    'tox',
-    'coverage',
-    'robotframework>=3.0',
-    'redis>=2.10.5'
-]
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+
+def readlines(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).readlines()
+
+
+version = read('VERSION')
+
+requirements = readlines('requirements.txt')
 
 test_requirements = [
+    'tox',
+    'coverage',
     'fakeredis==0.8.2'
 ]
 
@@ -25,7 +33,7 @@
 
 setup(
     name='robotframework-redislibrary',
-    version=VERSION,
+    version=version,
     description="robotframework-redislibrary is a Robot Framework test library for manipulating in-memory data which store in Redis",
     author="Traitanit Huangsri",
     author_email='[email protected]',