Skip to content

Commit 8a1700c

Browse files
authored
Merge branch 'master' into ck-rltest_latest
2 parents 882d25d + 5e0efb2 commit 8a1700c

File tree

8 files changed

+861
-18
lines changed

8 files changed

+861
-18
lines changed

.circleci/circle_requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
poetry==1.1.6
1+
poetry>=1.2.0
22
tox>=3.23.1

.circleci/config.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ commands:
5858
# - checkout
5959
# - run:
6060
# name: install_redisgears_py_to_RedisGears_virtual_env
61-
# command: /var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 setup.py install
61+
# command: /var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 setup.py install
6262
# - run:
6363
# name: install RLTest
64-
# command: /var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m pip install git+https://github.com/Grokzen/redis-py-cluster.git@master git+https://github.com/RedisLabsModules/RLTest.git
64+
# command: /var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m pip install git+https://github.com/Grokzen/redis-py-cluster.git@master git+https://github.com/RedisLabsModules/RLTest.git
6565
# - run:
6666
# name: run_tests
67-
# command: /var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m RLTest --module ../redisgears.so --module-args "Plugin /var/opt/redislabs/modules/rg/plugin/gears_python.so"
67+
# command: /var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m RLTest --module ../redisgears.so --module-args "Plugin /var/opt/redislabs/modules/rg/plugin/gears_python.so"
6868

6969
#workflows:
7070
# version: 2
@@ -89,28 +89,28 @@ commands:
8989
- run:
9090
name: install tox dependencies
9191
command: |
92-
/var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m pip install --upgrade pip virtualenv
93-
/var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m pip install -r .circleci/circle_requirements.txt
92+
/var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m pip install --upgrade pip virtualenv setuptools
93+
/var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m pip install -r .circleci/circle_requirements.txt
9494
9595
- run:
9696
name: build sdist and wheels
9797
command: |
98-
/var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m poetry build
98+
/var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m poetry build
9999
100100
# - run:
101101
# name: lint
102102
# command: |
103-
# /var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m tox -e linters
103+
# /var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m tox -e linters
104104
#
105105
- run:
106106
name: run tests
107107
command:
108-
/var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m tox -e tests
108+
/var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m tox -e tests
109109

110110
jobs:
111111
build:
112112
docker:
113-
- image: redislabs/redisgears:edge
113+
- image: redislabs/redisgears:1.2.5
114114

115115
steps:
116116
- build_and_test
@@ -120,7 +120,7 @@ jobs:
120120

121121
nightly:
122122
docker:
123-
- image: redislabs/redisgears:edge
123+
- image: redislabs/redisgears:1.2.5
124124
steps:
125125
- build_and_test
126126
- dockerize

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,4 @@ venv.bak/
102102

103103
# mypy
104104
.mypy_cache/
105+
requirements.txt

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
[![GitHub issues](https://img.shields.io/github/release/RedisGears/redisgears-py.svg)](https://github.com/RedisGears/redisgears-py/releases/latest)
55
[![Codecov](https://codecov.io/gh/RedisGears/redisgears-py/branch/master/graph/badge.svg)](https://codecov.io/gh/RedisGears/redisgears-py)
66
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/RedisGears/redisgears-py.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/RedisGears/redisgears-py/context:python)
7-
[![Known Vulnerabilities](https://snyk.io/test/github/RedisJSON/redisjson-py/badge.svg?targetFile=pyproject.toml)](https://snyk.io/test/github/RedisJSON/redisjson-py?targetFile=pyproject.toml)
7+
[![Known Vulnerabilities](https://snyk.io/test/github/RedisGears/redisgears-py/badge.svg?targetFile=pyproject.toml)](https://snyk.io/test/github/RedisGears/redisgears-pytargetFile=pyproject.toml)
88

99
# redisgears-py
10-
[![Forum](https://img.shields.io/badge/Forum-RedisGears-blue)](https://forum.redislabs.com/c/modules/redisgears)
10+
[![Forum](https://img.shields.io/badge/Forum-RedisGears-blue)](https://forum.redis.com/c/modules/redisgears)
1111
[![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/6yaVTtp)
1212

1313
[RedisGears](http://redisgears.io) python client (support python3 only!)

gearsclient/redisgears_builder.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ def limit(self, count, offset=0):
287287

288288
def run(self, arg=None, collect=True, **kargs):
289289
self.map(lambda x: cloudpickle.dumps(x))
290-
self.pipe.run(arg, False, collect)
290+
self.pipe.run(arg, False, collect, **kargs)
291291
selfBytes = cloudpickle.dumps(self.pipe)
292292
serverCode = '''
293293
import cloudpickle

0 commit comments

Comments
 (0)