Merge branch 'main' into java/integ_acarbo_add_xrevrange_command

valkey-io · Jun 6, 2024 · aecb8a9 · aecb8a9
2 parents 935b465 + f058fb7
commit aecb8a9
Show file tree

Hide file tree

Showing 43 changed files with 2,154 additions and 299 deletions.
diff --git a/.github/workflows/install-redis-modules/action.yml b/.github/workflows/install-redis-modules/action.yml
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -61,11 +61,6 @@ jobs:
                   target: "x86_64-unknown-linux-gnu"
                   github-token: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Install Redis Modules
-              uses: ./.github/workflows/install-redis-modules
-              with:
-                  redis-version: ${{ matrix.redis }} 
-
             - name: test
               run: npm test
               working-directory: ./node
@@ -83,10 +78,6 @@ jobs:
                 npm ci
                 npm run build-and-test
               working-directory: ./node/hybrid-node-tests/ecmascript-test
-
-            - name: test redis modules
-              run: npm run test-modules -- --load-module=$GITHUB_WORKSPACE/redisjson.so
-              working-directory: ./node
 
             - uses: ./.github/workflows/test-benchmark
               with:

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -99,17 +99,12 @@ jobs:
                   pip install -r ../benchmarks/python/requirements.txt
                   python -m mypy ..
 
-            - name: Install Redis Modules
-              uses: ./.github/workflows/install-redis-modules
-              with:
-                  redis-version: ${{ matrix.redis }} 
-
             - name: Test with pytest
               working-directory: ./python
               run: |
                   source .env/bin/activate
                   cd python/tests/
-                  pytest --asyncio-mode=auto --override-ini=addopts= --load-module=$GITHUB_WORKSPACE/redisjson.so
+                  pytest --asyncio-mode=auto
 
             - uses: ./.github/workflows/test-benchmark
               with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Python: Added GETDEL command ([#1514](https://github.com/aws/glide-for-redis/pull/1514))
 * Python: Added ZINTER, ZUNION commands ([#1478](https://github.com/aws/glide-for-redis/pull/1478))
 * Python: Added SINTERCARD command ([#1511](https://github.com/aws/glide-for-redis/pull/1511))
+* Python: Added SORT command ([#1439](https://github.com/aws/glide-for-redis/pull/1439))
 
 ### Breaking Changes
 * Node: Update XREAD to return a Map of Map ([#1494](https://github.com/aws/glide-for-redis/pull/1494))