Skip to content

Commit c9ffd02

Browse files
updates
1 parent 2662d72 commit c9ffd02

File tree

6 files changed

+85
-28
lines changed

6 files changed

+85
-28
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ jobs:
5252
- name: Install dependencies
5353
run: |
5454
poetry install --all-extras
55-
poetry run pip install ranx
5655
5756
- name: Authenticate to Google Cloud
5857
uses: google-github-actions/auth@v1
@@ -79,7 +78,7 @@ jobs:
7978
make test-all
8079
8180
test:
82-
name: Python ${{ matrix.python-version }} - ${{ matrix.connection }} - redis-py ${{ matrix.redis-py-version }} [redis ${{ matrix.redis-version }}]
81+
name: Python ${{ matrix.python-version }} - redis-py ${{ matrix.redis-py-version }} [redis ${{ matrix.redis-version }}]
8382
runs-on: ubuntu-latest
8483
needs: service-tests
8584
env:
@@ -89,7 +88,6 @@ jobs:
8988
matrix:
9089
# 3.11 tests are run in the service-tests job
9190
python-version: ["3.9", "3.10", 3.12, 3.13]
92-
connection: ["hiredis", "plain"]
9391
redis-py-version: ["5.x", "6.x"]
9492
redis-version: ["6.2.6-v9", "latest", "8.0.1"]
9593

@@ -117,7 +115,6 @@ jobs:
117115
- name: Install dependencies
118116
run: |
119117
poetry install --all-extras
120-
poetry run pip install ranx
121118
122119
# Install right redis version based on redis py
123120
if [[ "${{ matrix.redis-py-version }}" == "5.x" ]]; then
@@ -126,11 +123,6 @@ jobs:
126123
poetry add "redis>=6.0.0,<7.0.0"
127124
fi
128125
129-
# Install hiredis if selected
130-
if [[ "${{ matrix.connection }}" == "hiredis" ]]; then
131-
poetry add hiredis
132-
fi
133-
134126
- name: Set Redis image name
135127
run: |
136128
if [[ "${{ matrix.redis-version }}" == "8.0.1" ]]; then
@@ -145,21 +137,21 @@ jobs:
145137
credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
146138

147139
- name: Run tests
148-
if: matrix.connection == 'plain' && matrix.redis-py-version == '6.x' && matrix.redis-version == 'latest'
140+
# if: matrix.redis-py-version == '6.x' && matrix.redis-version == 'latest'
149141
env:
150142
HF_HOME: ${{ github.workspace }}/hf_cache
151143
GCP_LOCATION: ${{ secrets.GCP_LOCATION }}
152144
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
153145
run: |
154146
make test
155147
156-
- name: Run tests (alternate)
157-
if: matrix.connection != 'plain' || matrix.redis-py-version != '6.x' || matrix.redis-version != 'latest'
158-
run: |
159-
make test
148+
# - name: Run tests (alternate)
149+
# if: matrix.redis-py-version != '6.x' || matrix.redis-version != 'latest'
150+
# run: |
151+
# make test
160152

161153
- name: Run notebooks
162-
if: matrix.connection == 'plain' && matrix.redis-py-version == '6.x' && matrix.redis-version == 'latest'
154+
if: matrix.redis-py-version == '6.x' && matrix.redis-version == 'latest'
163155
env:
164156
HF_HOME: ${{ github.workspace }}/hf_cache
165157
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
@@ -177,11 +169,7 @@ jobs:
177169
HF_TOKEN: ${{ secrets.HF_TOKEN }}
178170
run: |
179171
docker run -d --name redis -p 6379:6379 redis/redis-stack-server:latest
180-
if [[ "${{ matrix.python-version }}" > "3.9" ]]; then
181-
make test-notebooks
182-
else
183-
poetry run test-notebooks --ignore ./docs/user_guide/09_threshold_optimization.ipynb --ignore ./docs/user_guide/release_guide/0_5_1_release.ipynb
184-
fi
172+
make test-notebooks
185173
186174
docs:
187175
runs-on: ubuntu-latest

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
# -- Project information -----------------------------------------------------
2121

22-
from redisvl.version import __version__
22+
from redisvl import __version__
2323

2424
project = 'RedisVL'
2525
copyright = '2024, Redis Inc.'

docs/overview/cli.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"name": "stdout",
2525
"output_type": "stream",
2626
"text": [
27-
"09:23:57 [RedisVL] INFO RedisVL version 0.7.1\n"
27+
"12:07:26 [RedisVL] INFO RedisVL version 0.6.0\n"
2828
]
2929
}
3030
],

poetry.lock

Lines changed: 70 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ voyageai = { version = ">=0.2.2", optional = true }
3939
sentence-transformers = { version = "^3.4.0", optional = true }
4040
boto3 = { version = "^1.36.0", optional = true }
4141
urllib3 = { version = "<2.2.0", optional = true }
42+
scipy = [
43+
{ version = ">=1.9.0,<1.14", python = "<3.10", optional = true },
44+
{ version = ">=1.14.0,<1.16", python = ">=3.10", optional = true }
45+
]
4246

4347
[tool.poetry.extras]
4448
mistralai = ["mistralai"]

redisvl/redis/connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
from redis.connection import SSLConnection
1313
from redis.exceptions import ResponseError
1414

15+
from redisvl import __version__
1516
from redisvl.exceptions import RedisModuleVersionError
1617
from redisvl.redis.constants import DEFAULT_REQUIRED_MODULES, REDIS_URL_ENV_VAR
1718
from redisvl.redis.utils import convert_bytes, is_cluster_url
1819
from redisvl.types import AsyncRedisClient, RedisClient, SyncRedisClient
1920
from redisvl.utils.utils import deprecated_function
20-
from redisvl.version import __version__
2121

2222

2323
def compare_versions(version1: str, version2: str):

0 commit comments

Comments
 (0)