Merge branch 'master' of github.com:RedisTimeSeries/redistimeseries-py

Author: gkorland

.circleci/config.yml

@@ -3,7 +3,21 @@
 #
 # Check https://circleci.com/docs/2.0/language-python/ for more details
 #
-version: 2
+version: 2.1
+commands:
+  early_return_for_forked_pull_requests:
+    description: >-
+      If this build is from a fork, stop executing the current job and return success.
+      This is useful to avoid steps that will fail due to missing credentials.
+    steps:
+      - run:
+          name: Early return if this build is from a forked PR
+          command: |
+            if [ -n "$CIRCLE_PR_NUMBER" ]; then
+              echo "Nothing to do for forked PRs, so marking this step successful"
+              circleci step halt
+            fi
+
 jobs:
   build:
     docker:
@@ -43,11 +57,14 @@ jobs:
           command: |
             . venv/bin/activate
             REDIS_PORT=6379 coverage run test_commands.py
+
+      - early_return_for_forked_pull_requests
+       
+      - run:
+          name: codecove
+          command: |
+            . venv/bin/activate
             codecov
-            
-      - store_artifacts:
-          path: test-reports
-          destination: test-reports
 
   build_nightly:
     docker:

redistimeseries/client.py

@@ -1,4 +1,3 @@
-import six
 from redis import Redis
 from redis.client import Pipeline
 from redis.client import bool_ok
@@ -103,8 +102,8 @@ def __init__(self, *args, **kwargs):
             self.INFO_CMD : TSInfo,
             self.QUERYINDEX_CMD : parseToList,
         }
-        for k, v in six.iteritems(MODULE_CALLBACKS):
-            self.set_response_callback(k, v)
+        for k in MODULE_CALLBACKS:
+            self.set_response_callback(k, MODULE_CALLBACKS[k])
 
     @staticmethod
     def appendRetention(params, retention):

requirements.txt

@@ -1,5 +1,3 @@
-
 hiredis>=0.2.0
 redis>=2.10
 rmtest>=0.2
-six>=1.10.0