Python: added 3.11, dropped 3.6; Picked up redis-py 4.5.1 (#189)

Author: rafie

.github/workflows/ci.yml

@@ -15,27 +15,24 @@ jobs:
     timeout-minutes: 40
     strategy:
       matrix:
-        platform: ['ubuntu-20.04']
-        python: ['3.6', '3.7', '3.8', '3.9']
+        platform: ['ubuntu-20.04', 'macos-11']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11']
+      fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       # Number of commits to fetch. 0 indicates all history for all branches and tags.
       with:
         fetch-depth: ''
 
-    - name: Install OpenSSL development libraries
-      run: |
-        sudo apt-get install -y libssl-dev
-
     - name: Setup Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
         architecture: x64
 
     - name: Cache pip
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip # This path is specific to Ubuntu
         # Look to see if there is a cache hit for the corresponding requirements file
@@ -45,29 +42,18 @@ jobs:
 
     - name: Install Python dependencies
       run: |
-        sudo apt-get install -y python3-setuptools
         pip install poetry
         poetry config virtualenvs.create false
         poetry export --dev --without-hashes -o requirements-${{matrix.platform}}-${{matrix.python}}.txt
         pip install -r requirements-${{matrix.platform}}-${{matrix.python}}.txt
 
-    # - name: Cache Redis
-    #   id: cache-redis
-    #   uses: actions/cache@v1
-    #   with:
-    #     path: redis
-    #     key: ${{ matrix.platform }}-${{ matrix.python }}-redis
-    #     restore-keys: |
-    #       ${{ matrix.platform }}-${{ matrix.python }}-redis
-
     - name: Install Redis Server test dependencies
       # if: steps.cache-redis.outputs.cache-hit != 'true'
       run: |
         git clone https://github.com/redis/redis.git --branch 6.2.7 --depth 1
         cd redis
         make BUILD_TLS=yes -j
         ./src/redis-server --version
-        cd ..
 
     - name: Generate test certificates
       run: |
@@ -92,9 +78,7 @@ jobs:
       run: |
         cd tests/flow
         make -C modules
-        CONTAINS_MODULES=1 RLTest --env oss -v --clear-logs --oss-redis-path ../../redis/src/redis-server \
-          --module modules/module1.so
-        cd ..
+        CONTAINS_MODULES=1 RLTest --env oss -v --clear-logs --oss-redis-path ../../redis/src/redis-server --module modules/module1.so
 
     - name: Flow Test OSS Multiple Modules  --use-slaves
       run: |
@@ -103,7 +87,6 @@ jobs:
         CONTAINS_MODULES=1 RLTest --env oss -v --clear-logs --oss-redis-path ../../redis/src/redis-server \
           --module modules/module1.so --module-args '' --module modules/module2.so --module-args '' \
           --use-slaves
-        cd ..
 
     - name: Flow Test OSS Multiple Modules  --use-aof
       run: |
@@ -112,47 +95,40 @@ jobs:
         CONTAINS_MODULES=1 RLTest --env oss -v --clear-logs --oss-redis-path ../../redis/src/redis-server \
           --module modules/module1.so --module-args '' --module modules/module2.so --module-args '' \
           --use-aof
-        cd ..
 
     - name: Flow Test OSS Multiple Modules
       run: |
         cd tests/flow
         make -C modules
         CONTAINS_MODULES=1 RLTest --env oss -v --clear-logs --oss-redis-path ../../redis/src/redis-server \
           --module modules/module1.so --module-args '' --module modules/module2.so --module-args ''
-        cd ..
 
     - name: Flow Test OSS-CLUSTER Modules
       run: |
         cd tests/flow
         make -C modules
         CONTAINS_MODULES=1 RLTest --env oss-cluster -v --clear-logs --oss-redis-path ../../redis/src/redis-server \
           --module modules/module1.so --module-args '' --module modules/module2.so --module-args ''
-        cd ..
 
     - name: Flow Test OSS TCP
       run: |
         cd tests/flow
         RLTest --env oss -v --clear-logs --oss-redis-path ../../redis/src/redis-server
-        cd ..
 
     - name: Flow Test OSS UNIX SOCKETS
       run: |
         cd tests/flow
         RLTest --env oss -v --clear-logs --oss-redis-path ../../redis/src/redis-server
-        cd ..
 
     - name: Flow Test OSS TCP SLAVES
       run: |
         cd tests/flow
         RLTest --env oss -v --unix --clear-logs --oss-redis-path ../../redis/src/redis-server
-        cd ..
 
     - name: Flow Test OSS-CLUSTER TCP
       run: |
         cd tests/flow
         RLTest --env oss-cluster -v --clear-logs --shards-count 3 --oss-redis-path ../../redis/src/redis-server
-        cd ..
 
     - name: Flow Test OSS TCP with TLS
       run: |
@@ -163,7 +139,6 @@ jobs:
         --tls-key-file ../../redis/tests/tls/redis.key \
         --tls-ca-cert-file ../../redis/tests/tls/ca.crt \
         --tls
-        cd ..
 
     - name: Flow Test OSS-CLUSTER with TLS
       run: |
@@ -174,7 +149,6 @@ jobs:
         --tls-key-file ../../redis/tests/tls/redis.key \
         --tls-ca-cert-file ../../redis/tests/tls/ca.crt \
         --tls
-        cd ..
 
     - name: Flow Test OSS-CLUSTER with SLAVES and TLS
       run: |
@@ -185,10 +159,9 @@ jobs:
         --tls-key-file ../../redis/tests/tls/redis.key \
         --tls-ca-cert-file ../../redis/tests/tls/ca.crt \
         --tls
-        cd ../..
 
     - name: Generate coverage report
-      if: matrix.python == '3.6'
+      if: matrix.python == '3.9' && matrix.platform != 'macos-11'
       run: |
         TLS_CERT=./redis/tests/tls/redis.crt \
         TLS_KEY=./redis/tests/tls/redis.key \
@@ -197,8 +170,8 @@ jobs:
         pytest --ignore=tests/flow --ignore=test_example.py --cov-config=.coveragerc --cov-report=xml --cov=RLTest
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
-      if: matrix.python == '3.6'
+      uses: codecov/codecov-action@v3
+      if: matrix.python == '3.9' && matrix.platform != 'macos-11'
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./coverage.xml

.gitignore

@@ -112,3 +112,6 @@ venv.bak/
 
 # vscode
 .vscode
+
+# Misc
+/1/

RLTest.sh

@@ -582,7 +582,13 @@ def _runTest(self, test, numberOfAssertionFailed=0, prefix='', before=None, afte
         if not test.is_method:
             Defaults.curr_test_name = testFullName
 
-        if len(inspect.getargspec(test.target).args) > 0 and not test.is_method:
+        try:
+            # Python < 3.11
+            test_args = inspect.getargspec(test.target).args
+        except:
+            test_args = inspect.getfullargspec(test.target).args
+        
+        if len(test_args) > 0 and not test.is_method:
             try:
                 env = Env(testName=test.name)
             except Exception as e:

RLTest/__main__.py

@@ -1,8 +1,8 @@
 [tool.poetry]
 name = "RLTest"
-version = "0.5.12"
-description="Redis Labs Test Framework, allow to run tests on redis and modules on a variety of environments"
-authors = ["RedisLabs <oss@redislabs.com>"]
+version = "0.6.0"
+description="Redis Modules Test Framework, allow to run tests on redis and modules on a variety of environments"
+authors = ["Redis, Inc. <oss@redis.com>"]
 license = "BSD-3-Clause"
 readme = "README.md"
 
@@ -14,19 +14,19 @@ classifiers = [
     'Topic :: Database',
     'Programming Language :: Python',
     'Intended Audience :: Developers',
-    'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
     'License :: OSI Approved :: BSD License',
     'Development Status :: 5 - Production/Stable'
 ]
 
 [tool.poetry.dependencies]
-python = ">= 3.6.0"
+python = ">= 3.7.0"
 distro = "^1.5.0"
-redis = "^4.2.2"
+redis = "^4.5.1"
 psutil = "5.8.0" # 5.9.0 currently broken on macOS
 pytest-cov = "2.5"
 

RLTest2.sh

@@ -5,20 +5,21 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 ifeq ($(uname_S),Linux)
 	SHOBJ_CFLAGS ?=  -fno-common -g -ggdb
 	SHOBJ_LDFLAGS ?= -shared -Bsymbolic
+	CC=gcc
 else
 	SHOBJ_CFLAGS ?= -dynamic -fno-common -g -ggdb
-	SHOBJ_LDFLAGS ?= -bundle -undefined dynamic_lookup
+	SHOBJ_LDFLAGS ?= -dynamiclib -undefined dynamic_lookup
+	CC=clang
 endif
-CFLAGS = -I$(RM_INCLUDE_DIR) -Wall -g -fPIC -lc -lm -std=gnu99  
-CC=gcc
+CFLAGS = -I$(RM_INCLUDE_DIR) -Wall -g -fPIC -std=gnu99  
 
 all: module1.so module2.so
 
 module1.so: module1.o
-	$(LD) -o $@ module1.o $(SHOBJ_LDFLAGS) $(LIBS) -lc 
+	$(CC) -o $@ module1.o $(SHOBJ_LDFLAGS) $(LIBS)
 
 module2.so: module2.o
-	$(LD) -o $@ module2.o $(SHOBJ_LDFLAGS) $(LIBS) -lc 
+	$(CC) -o $@ module2.o $(SHOBJ_LDFLAGS) $(LIBS)
 
 clean:
 	rm -rf *.xo *.so *.o