Skip to content

Commit a302ad2

Browse files
authored
Merge branch 'main' into feat/fastembed-colbert-reranker
2 parents 7eeeec0 + c287acf commit a302ad2

File tree

41 files changed

+60
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+60
-40
lines changed

integrations/aimlapi/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dependencies = [
6464
unit = 'pytest -m "not integration" {args:tests}'
6565
integration = 'pytest -m "integration" {args:tests}'
6666
all = 'pytest {args:tests}'
67-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
67+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
6868

6969
types = "mypy -p haystack_integrations.components.generators.aimlapi {args}"
7070

integrations/amazon_bedrock/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies = [
6666
unit = 'pytest -m "not integration" {args:tests}'
6767
integration = 'pytest -m "integration" {args:tests}'
6868
all = 'pytest {args:tests}'
69-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
69+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
7070

7171
types = """mypy -p haystack_integrations.common.amazon_bedrock \
7272
-p haystack_integrations.components.embedders.amazon_bedrock \

integrations/amazon_sagemaker/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies = [
6666
unit = 'pytest -m "not integration" {args:tests}'
6767
integration = 'pytest -m "integration" {args:tests}'
6868
all = 'pytest {args:tests}'
69-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
69+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
7070
types = "mypy -p haystack_integrations.components.generators.amazon_sagemaker {args}"
7171

7272
[tool.mypy]

integrations/anthropic/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies = [
6565
unit = 'pytest -m "not integration" {args:tests}'
6666
integration = 'pytest -m "integration" {args:tests}'
6767
all = 'pytest {args:tests}'
68-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
68+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
6969

7070
types = "mypy -p haystack_integrations.components.generators.anthropic {args}"
7171

integrations/astra/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies = [
6363
unit = 'pytest -m "not integration" {args:tests}'
6464
integration = 'pytest -m "integration" {args:tests}'
6565
all = 'pytest {args:tests}'
66-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
66+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
6767
types = """mypy -p haystack_integrations.document_stores.astra \
6868
-p haystack_integrations.components.retrievers.astra {args}"""
6969

integrations/azure_ai_search/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dependencies = [
6464
unit = 'pytest -m "not integration" {args:tests}'
6565
integration = 'pytest -m "integration" {args:tests}'
6666
all = 'pytest {args:tests}'
67-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
67+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
6868

6969
types = """mypy -p haystack_integrations.document_stores.azure_ai_search \
7070
-p haystack_integrations.components.retrievers.azure_ai_search {args}"""

integrations/chroma/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dependencies = [
6464
unit = 'pytest -m "not integration" {args:tests}'
6565
integration = 'pytest -m "integration" {args:tests}'
6666
all = 'pytest {args:tests}'
67-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
67+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
6868

6969
types = "mypy -p haystack_integrations.components.retrievers.chroma -p haystack_integrations.document_stores.chroma {args}"
7070

integrations/cohere/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies = [
6666
unit = 'pytest -m "not integration" {args:tests}'
6767
integration = 'pytest -m "integration" {args:tests}'
6868
all = 'pytest {args:tests}'
69-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
69+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
7070

7171
types = """mypy -p haystack_integrations.components.embedders.cohere \
7272
-p haystack_integrations.components.generators.cohere \

integrations/deepeval/CHANGELOG.md

Lines changed: 20 additions & 0 deletions

integrations/deepeval/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ dependencies = [
6262
unit = 'pytest -m "not integration" {args:tests}'
6363
integration = 'pytest -m "integration" {args:tests}'
6464
all = 'pytest {args:tests}'
65-
cov-retry = 'all --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x'
65+
cov-retry = 'pytest --cov=haystack_integrations --reruns 3 --reruns-delay 30 -x {args:tests}'
6666
types = "mypy -p haystack_integrations.components.evaluators.deepeval {args}"
6767

6868
[tool.mypy]

0 commit comments

Comments
 (0)