Skip to content

Commit

Permalink
pin es client to include bugfixes (#2735)
Browse files Browse the repository at this point in the history
  • Loading branch information
masci authored Jun 27, 2022
1 parent 8d65bc5 commit 1e01cd0
Showing 1 changed file with 46 additions and 46 deletions.
92 changes: 46 additions & 46 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ description = Neural Question Answering & Semantic Search at Scale. Use modern t
long_description = file: README.md
long_description_content_type = text/markdown
keywords=
QA
Question-Answering
Reader
Retriever
semantic-search
search
BERT
roberta
albert
squad
mrc
transfer-learning
language-model
QA
Question-Answering
Reader
Retriever
semantic-search
search
BERT
roberta
albert
squad
mrc
transfer-learning
language-model
transformer
author = deepset.ai
author_email = [email protected]
Expand Down Expand Up @@ -69,7 +69,7 @@ install_requires =
posthog # telemetry
azure-ai-formrecognizer==3.2.0b2 # forms reader
# azure-core is a dependency of azure-ai-formrecognizer
# In order to stop malicious pip backtracking during pip install farm-haystack[all] documented in https://github.com/deepset-ai/haystack/issues/2280
# In order to stop malicious pip backtracking during pip install farm-haystack[all] documented in https://github.com/deepset-ai/haystack/issues/2280
# we have to resolve a dependency version conflict ourself.
# azure-core>=1.23 conflicts with pydoc-markdown's dependency on databind>=1.5.0 which itself requires typing-extensions<4.0.0
# azure-core>=1.23 needs typing-extensions>=4.0.1
Expand All @@ -86,20 +86,20 @@ install_requires =
sentence-transformers>=2.2.0

# for stats in run_classifier
scipy>=1.3.2
scipy>=1.3.2
scikit-learn>=1.0.0

# Metrics and logging
seqeval
mlflow

# Elasticsearch
elasticsearch>=7.7,<=7.10
elasticsearch>=7.7,<7.11
elastic-apm

# context matching
rapidfuzz==2.0.13

# Schema validation
jsonschema

Expand All @@ -113,79 +113,79 @@ exclude =


[options.package_data]
haystack =
haystack =
json-schemas/*.schema.json


[options.extras_require]
sql =
sql =
sqlalchemy>=1.4.2,<2
sqlalchemy_utils
psycopg2-binary; platform_system != 'Windows'
only-faiss =
only-faiss =
faiss-cpu>=1.6.3,<2
faiss =
faiss =
farm-haystack[sql,only-faiss]
only-faiss-gpu =
only-faiss-gpu =
faiss-gpu>=1.6.3,<2
faiss-gpu =
faiss-gpu =
farm-haystack[sql,only-faiss-gpu]
only-milvus1 =
only-milvus1 =
pymilvus<2.0.0 # Refer milvus version support matrix at https://github.com/milvus-io/pymilvus#install-pymilvus
milvus1 =
milvus1 =
farm-haystack[sql,only-milvus1]
only-milvus =
only-milvus =
pymilvus>=2.0.0,<3 # Refer milvus version support matrix at https://github.com/milvus-io/pymilvus#install-pymilvus
milvus =
milvus =
farm-haystack[sql,only-milvus]
weaviate =
weaviate-client==3.3.3
only-pinecone =
only-pinecone =
pinecone-client
pinecone =
farm-haystack[sql,only-pinecone]
graphdb =
graphdb =
SPARQLWrapper
inmemorygraph =
SPARQLWrapper
inmemorygraph =
SPARQLWrapper
docstores =
farm-haystack[faiss,milvus,weaviate,graphdb,inmemorygraph,pinecone]
docstores-gpu =
farm-haystack[faiss-gpu,milvus,weaviate,graphdb,inmemorygraph,pinecone]

audio =
audio =
espnet
espnet-model-zoo
pydub
huggingface-hub<0.8.0
beir =
beir =
beir; platform_system != 'Windows'
crawler =
crawler =
selenium !=4.1.4 # due to https://github.com/SeleniumHQ/selenium/issues/10612
webdriver-manager
preprocessing =
preprocessing =
beautifulsoup4
markdown
python-magic; platform_system != 'Windows' # Depends on libmagic: https://pypi.org/project/python-magic/
python-magic-bin; platform_system == 'Windows' # Needs to be installed without python-magic, otherwise Windows CI gets stuck.
ocr =
ocr =
pytesseract==0.3.7
pillow
pdf2image==1.14.0
onnx =
onnx =
onnxruntime
onnxruntime_tools
onnx-gpu =
onnx-gpu =
onnxruntime-gpu
onnxruntime_tools
ray =
ray =
ray>=1.9.1,<2; platform_system != 'Windows'
ray>=1.9.1,<2,!=1.12.0; platform_system == 'Windows' # Avoid 1.12.0 due to https://github.com/ray-project/ray/issues/24169 (fails on windows)
aiorwlock>=1.3.0,<2

colab =
colab =
grpcio==1.43.0
dev =
dev =
# Type check
mypy
typing_extensions; python_version < '3.8'
Expand All @@ -200,14 +200,14 @@ dev =
# Linting
pylint
# Code formatting
black[jupyter]
black[jupyter]
# Documentation
pydoc-markdown==4.5.1 # FIXME Unpin!
mkdocs
jupytercontrib
mkdocs
jupytercontrib
watchdog #==1.0.2
requests-cache
test =
test =
farm-haystack[docstores,audio,crawler,preprocessing,ocr,ray,dev]
all =
farm-haystack[docstores,audio,crawler,preprocessing,ocr,ray,dev,onnx,beir]
Expand All @@ -216,7 +216,7 @@ all-gpu =


[tool:pytest]
testpaths =
testpaths =
test
rest_api/test
ui/test
Expand Down

0 comments on commit 1e01cd0

Please sign in to comment.