Skip to content

Commit fcf4a21

Browse files
authored
Merge branch 'main' into feat/fastembed-colbert-reranker
2 parents 6d30a65 + 4c4d94b commit fcf4a21

File tree

47 files changed

+105
-85
lines changed

Some content is hidden

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

47 files changed

+105
-85
lines changed

.github/workflows/deepeval.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
os: [ubuntu-latest, windows-latest, macos-latest]
35-
python-version: ["3.9", "3.13"]
35+
python-version: ["3.10", "3.13"]
3636

3737
steps:
3838
- name: Support longpaths
@@ -50,11 +50,11 @@ jobs:
5050
- name: Install Hatch
5151
run: pip install --upgrade hatch
5252
- name: Lint
53-
if: matrix.python-version == '3.9' && runner.os == 'Linux'
53+
if: matrix.python-version == '3.10' && runner.os == 'Linux'
5454
run: hatch run fmt-check && hatch run test:types
5555

5656
- name: Generate docs
57-
if: matrix.python-version == '3.9' && runner.os == 'Linux'
57+
if: matrix.python-version == '3.10' && runner.os == 'Linux'
5858
run: hatch run docs
5959

6060
- name: Run tests

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
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# Changelog
22

3+
## [integrations/deepeval-v1.0.0] - 2025-10-30
4+
5+
### 📚 Documentation
6+
7+
- Add pydoc configurations for Docusaurus (#2411)
8+
9+
### ⚙️ CI
10+
11+
- Install dependencies in the `test` environment when testing with lowest direct dependencies and Haystack main (#2418)
12+
13+
### 🧹 Chores
14+
15+
- Standardize readmes - part 1 (#2202)
16+
17+
### 🌀 Miscellaneous
18+
19+
- Chore: Remove ruff excludes and fix linting for deepeval (#2253)
20+
- Test: Fix tests in deepeval (#2368)
21+
- Chore!: Upgrade to minimum version of python 3.10 (#2476)
22+
323
## [integrations/deepeval-v0.3.0] - 2025-07-08
424

525
### 🚀 Features

0 commit comments

Comments
 (0)