From 12d7628b1060bf68eb7dfc37ff4c1f72e9a8e8e9 Mon Sep 17 00:00:00 2001 From: Yao You Date: Wed, 13 Sep 2023 18:19:20 -0500 Subject: [PATCH] update constraints to pin weaviate during ci (#1408) This PR ensures the version for `weaviate` is consistent in CI testing. Latest (3.24.1) is not compatible with our test needs and last version that run successfully in CI is 3.23.2. --- .github/workflows/ci.yml | 12 ++++-------- Makefile | 3 ++- requirements/constraints.in | 3 ++- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b0d5fd2c..4b19909e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,10 +145,8 @@ jobs: sudo add-apt-repository -y ppa:alex-p/tesseract-ocr5 sudo apt-get install -y tesseract-ocr tesseract-ocr-kor tesseract --version - # NOTE(robinson) - Installing weaviate-client separately here because the requests - # version conflicts with label_studio_sdk - pip install weaviate-client - pip install argilla + # FIXME (yao): sometimes there is cache but we still miss argilla in the env; so we add make install-ci again + make install-ci make test CI=true make check-coverage @@ -227,10 +225,6 @@ jobs: sudo add-apt-repository -y ppa:alex-p/tesseract-ocr5 sudo apt-get install -y tesseract-ocr tesseract-ocr-kor tesseract --version - # NOTE(robinson) - Installing weaviate-client separately here because the requests - # version conflicts with label_studio_sdk - pip install weaviate-client - pip install argilla make test-extra-${{ matrix.extra }} CI=true test_ingest: @@ -365,6 +359,8 @@ jobs: if: env.SKIP_API_UNIT_FOR_BREAKING_CHANGE == 'false' run: | source .venv/bin/activate + # FIXME (yao): sometimes there is cache but we still miss argilla in the env; so we add make install-ci again + make install-ci sudo apt-get update && sudo apt-get install --yes poppler-utils libreoffice make install-pandoc sudo add-apt-repository -y ppa:alex-p/tesseract-ocr5 diff --git a/Makefile b/Makefile index 6757bbcfe..4be4622a2 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,8 @@ install-test: python3 -m pip install -r requirements/test.txt # NOTE(robinson) - Installing weaviate-client separately here because the requests # version conflicts with label_studio_sdk - python3 -m pip install weaviate-client + python3 -m pip install weaviate-client -c requirements/constraints.in + # TODO (yao): find out if how to constrain argilla properly without causing conflicts python3 -m pip install argilla .PHONY: install-dev diff --git a/requirements/constraints.in b/requirements/constraints.in index f6a3a6151..e309dc69c 100644 --- a/requirements/constraints.in +++ b/requirements/constraints.in @@ -29,4 +29,5 @@ unstructured-inference==0.5.23 pydantic<2 # unable to build wheel for arm on 0.3.3+ safetensors<=0.3.2 - +# use the known compatible version of weaviate +weaviate-client==3.23.2