Merge remote-tracking branch 'origin/develop'

Updated the changes and pypi username and password.

Author: Srikalyan Swayampakula

.travis.yml

@@ -10,9 +10,9 @@ install: pip install . --use-mirrors
 script: python setup.py nosetests
 deploy:
   provider: pypi
-  user: jessemyers
+  user: github-ll
   password:
-    secure: f7wqGCuSP6dJZ7GwdpQwMc9J0GU8oCK8tydUnvgLNass0U57Eg+PaQURPWxg0T1f5nYACzfche3YHTFeXtk1x7HV6WYWYddin/gv94m7u9+ZQpsrygGizv7eO3lU/vR3K86GrLdTR3z7ii50XDlM0W8XyqHDX1+GGHPWFGLxOHo=
+    secure: Ol3Gxz2iQEh7Oz64FZJfwLJK/r8QLlnE3aFKv6TkTxn8DedXK+mLUTC0PwueBSOIRGpnxlHwQyzrzxZWs2QOUoyB+Nbx6L1wU+NsgviNKJjAln4/tV4dAeI7GRJD2cDkRH9w2QihWnRFRh7BbmhfsD4WrsELP5k6onbVrQwU/Ao=
   on:
     tags: true
     repo: locationlabs/mockredis

CHANGES.md

@@ -1,8 +1,11 @@
+Version 2.9.3
+ - Support for `from_url`
+ - Going to remove develop and use master following github flow model.
+ 
 Version 2.9.2
  - Fixed the versioning issue.
 
 Version 2.9.1
- - Support for `from_url`
  - Support for `transaction`
  - Fix `do_expire` method in Python 3  
 

mockredis/client.py

@@ -59,6 +59,10 @@ def __init__(self,
         # Dictionary from script to sha ''Script''
         self.shas = dict()
 
+    @classmethod
+    def from_url(cls, url, db=None, **kwargs):
+        return cls(**kwargs)
+
     # Connection Functions #
 
     def echo(self, msg):
@@ -1536,6 +1540,8 @@ def mock_redis_client(**kwargs):
     """
     return MockRedis()
 
+mock_redis_client.from_url = mock_redis_client
+
 
 def mock_strict_redis_client(**kwargs):
     """
@@ -1544,3 +1550,5 @@ def mock_strict_redis_client(**kwargs):
     instead of a StrictRedis object.
     """
     return MockRedis(strict=True)
+
+mock_strict_redis_client.from_url = mock_strict_redis_client

mockredis/tests/test_factories.py

@@ -13,8 +13,22 @@ def test_mock_redis_client():
     ok_(not mock_redis_client(host="localhost", port=6379).strict)
 
 
+def test_mock_redis_client_from_url():
+    """
+    Test that we can pass kwargs to the Redis from_url mock/patch target.
+    """
+    ok_(not mock_redis_client.from_url(host="localhost", port=6379).strict)
+
+
 def test_mock_strict_redis_client():
     """
     Test that we can pass kwargs to the StrictRedis mock/patch target.
     """
     ok_(mock_strict_redis_client(host="localhost", port=6379).strict)
+
+
+def test_mock_strict_redis_client_from_url():
+    """
+    Test that we can pass kwargs to the StrictRedis from_url mock/patch target.
+    """
+    ok_(mock_strict_redis_client.from_url(host="localhost", port=6379).strict)

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 # Match releases to redis-py versions
-__version__ = '2.9.2'
+__version__ = '2.9.3'
 
 # Jenkins will replace __build__ with a unique value.
 __build__ = ''