From 280b925e16ab5605a124d412f66ff56caa492553 Mon Sep 17 00:00:00 2001 From: Ziniu Yu Date: Wed, 19 Apr 2023 12:52:33 +0800 Subject: [PATCH] fix: fix docarray at v1 (#911) * fix: fix docarray at v1 * fix: fix docarray at v1 * fix: pip version * fix: pip version * fix: pip version --- .github/workflows/ci.yml | 4 ++-- client/setup.py | 2 +- server/setup.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab7d9b26c..31772a581 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,7 +154,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Prepare enviroment run: | - python -m pip install --upgrade pip + python -m pip install pip==23.0.1 python -m pip install wheel pytest pytest-cov nvidia-pyindex pip install -e "client/[test]" pip install -e "server/[tensorrt]" @@ -211,7 +211,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Prepare enviroment run: | - python -m pip install --upgrade pip + python -m pip install pip==23.0.1 python -m pip install wheel pytest pytest-cov nvidia-pyindex pip install -e "client/[test]" pip install -e "server/[onnx]" diff --git a/client/setup.py b/client/setup.py index 6a15108c1..3aae4c955 100644 --- a/client/setup.py +++ b/client/setup.py @@ -41,7 +41,7 @@ long_description_content_type='text/markdown', zip_safe=False, setup_requires=['setuptools>=18.0', 'wheel'], - install_requires=['jina>=3.12.0', 'docarray[common]>=0.19.0', 'packaging'], + install_requires=['jina>=3.12.0', 'docarray[common]>=0.19.0,<0.30.0', 'packaging'], extras_require={ 'test': [ 'pytest', diff --git a/server/setup.py b/server/setup.py index b59f8b6a1..ad81a0bc4 100644 --- a/server/setup.py +++ b/server/setup.py @@ -46,6 +46,7 @@ 'regex', 'torchvision<=0.13.0' if sys.version_info <= (3, 7, 2) else 'torchvision', 'jina>=3.12.0', + 'docarray<0.30.0', 'prometheus-client', 'open_clip_torch>=2.8.0', ],