From 5ba44b9f2ad1d9e5d2d41ebd8b18976791335f30 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Tue, 6 Aug 2024 18:49:46 +0200 Subject: [PATCH 1/3] do not retry tests in hatch run test command --- .github/workflows/amazon_bedrock.yml | 2 +- .github/workflows/amazon_sagemaker.yml | 2 +- .github/workflows/anthropic.yml | 2 +- .github/workflows/astra.yml | 2 +- .github/workflows/chroma.yml | 2 +- .github/workflows/cohere.yml | 2 +- .github/workflows/deepeval.yml | 2 +- .github/workflows/elasticsearch.yml | 2 +- .github/workflows/fastembed.yml | 2 +- .github/workflows/google_ai.yml | 2 +- .github/workflows/google_vertex.yml | 2 +- .github/workflows/instructor_embedders.yml | 2 +- .github/workflows/jina.yml | 2 +- .github/workflows/langfuse.yml | 2 +- .github/workflows/llama_cpp.yml | 2 +- .github/workflows/mistral.yml | 2 +- .github/workflows/mongodb_atlas.yml | 2 +- .github/workflows/nvidia.yml | 2 +- .github/workflows/ollama.yml | 2 +- .github/workflows/opensearch.yml | 2 +- .github/workflows/optimum.yml | 2 +- .github/workflows/pgvector.yml | 2 +- .github/workflows/pinecone.yml | 2 +- .github/workflows/qdrant.yml | 2 +- .github/workflows/ragas.yml | 2 +- .github/workflows/unstructured.yml | 2 +- .github/workflows/weaviate.yml | 2 +- integrations/amazon_bedrock/pyproject.toml | 4 ++-- integrations/amazon_sagemaker/pyproject.toml | 4 ++-- integrations/anthropic/pyproject.toml | 4 ++-- integrations/astra/pyproject.toml | 4 ++-- integrations/chroma/pyproject.toml | 4 ++-- integrations/cohere/pyproject.toml | 4 ++-- integrations/deepeval/pyproject.toml | 4 ++-- integrations/elasticsearch/pyproject.toml | 4 ++-- integrations/fastembed/pyproject.toml | 4 ++-- integrations/google_ai/pyproject.toml | 4 ++-- integrations/google_vertex/pyproject.toml | 4 ++-- integrations/instructor_embedders/pyproject.toml | 4 ++-- integrations/jina/pyproject.toml | 4 ++-- integrations/langfuse/pyproject.toml | 4 ++-- integrations/llama_cpp/pyproject.toml | 4 ++-- integrations/mistral/pyproject.toml | 4 ++-- integrations/mongodb_atlas/pyproject.toml | 4 ++-- integrations/nvidia/pyproject.toml | 4 ++-- integrations/ollama/pyproject.toml | 4 ++-- integrations/opensearch/pyproject.toml | 4 ++-- integrations/optimum/pyproject.toml | 4 ++-- integrations/pgvector/pyproject.toml | 4 ++-- integrations/pinecone/pyproject.toml | 4 ++-- integrations/qdrant/pyproject.toml | 4 ++-- integrations/ragas/pyproject.toml | 4 ++-- integrations/unstructured/pyproject.toml | 4 ++-- integrations/weaviate/pyproject.toml | 4 ++-- 54 files changed, 81 insertions(+), 81 deletions(-) diff --git a/.github/workflows/amazon_bedrock.yml b/.github/workflows/amazon_bedrock.yml index eff39e2af..a91a37657 100644 --- a/.github/workflows/amazon_bedrock.yml +++ b/.github/workflows/amazon_bedrock.yml @@ -82,7 +82,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/amazon_sagemaker.yml b/.github/workflows/amazon_sagemaker.yml index 8ebbf6c65..c68f566e3 100644 --- a/.github/workflows/amazon_sagemaker.yml +++ b/.github/workflows/amazon_sagemaker.yml @@ -63,7 +63,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/anthropic.yml b/.github/workflows/anthropic.yml index 858b7be35..997c2fba4 100644 --- a/.github/workflows/anthropic.yml +++ b/.github/workflows/anthropic.yml @@ -60,7 +60,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/astra.yml b/.github/workflows/astra.yml index a264fdfd5..6f375a32b 100644 --- a/.github/workflows/astra.yml +++ b/.github/workflows/astra.yml @@ -67,7 +67,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/chroma.yml b/.github/workflows/chroma.yml index 496ddaa03..bb3a8e4d1 100644 --- a/.github/workflows/chroma.yml +++ b/.github/workflows/chroma.yml @@ -63,7 +63,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/cohere.yml b/.github/workflows/cohere.yml index 05b84af4b..bb57b3e90 100644 --- a/.github/workflows/cohere.yml +++ b/.github/workflows/cohere.yml @@ -64,7 +64,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/deepeval.yml b/.github/workflows/deepeval.yml index 0048528bc..5a4563f3f 100644 --- a/.github/workflows/deepeval.yml +++ b/.github/workflows/deepeval.yml @@ -64,7 +64,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml index 4cf34b301..295fab3c9 100644 --- a/.github/workflows/elasticsearch.yml +++ b/.github/workflows/elasticsearch.yml @@ -61,7 +61,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/fastembed.yml b/.github/workflows/fastembed.yml index 32b276466..7563f13c6 100644 --- a/.github/workflows/fastembed.yml +++ b/.github/workflows/fastembed.yml @@ -48,7 +48,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/google_ai.yml b/.github/workflows/google_ai.yml index 046b92463..1540705d6 100644 --- a/.github/workflows/google_ai.yml +++ b/.github/workflows/google_ai.yml @@ -64,7 +64,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/google_vertex.yml b/.github/workflows/google_vertex.yml index b4006924c..bc2661026 100644 --- a/.github/workflows/google_vertex.yml +++ b/.github/workflows/google_vertex.yml @@ -63,7 +63,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/instructor_embedders.yml b/.github/workflows/instructor_embedders.yml index 9d84066a7..e797f3f41 100644 --- a/.github/workflows/instructor_embedders.yml +++ b/.github/workflows/instructor_embedders.yml @@ -41,7 +41,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/jina.yml b/.github/workflows/jina.yml index cd0a55ad4..eae7b9224 100644 --- a/.github/workflows/jina.yml +++ b/.github/workflows/jina.yml @@ -63,7 +63,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/langfuse.yml b/.github/workflows/langfuse.yml index edbec4840..2576620f2 100644 --- a/.github/workflows/langfuse.yml +++ b/.github/workflows/langfuse.yml @@ -66,7 +66,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/llama_cpp.yml b/.github/workflows/llama_cpp.yml index ec86ab268..6890b9b82 100644 --- a/.github/workflows/llama_cpp.yml +++ b/.github/workflows/llama_cpp.yml @@ -63,7 +63,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/mistral.yml b/.github/workflows/mistral.yml index efc8ed065..c3165dc38 100644 --- a/.github/workflows/mistral.yml +++ b/.github/workflows/mistral.yml @@ -64,7 +64,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/mongodb_atlas.yml b/.github/workflows/mongodb_atlas.yml index 9c4f17ba0..0796bf917 100644 --- a/.github/workflows/mongodb_atlas.yml +++ b/.github/workflows/mongodb_atlas.yml @@ -60,7 +60,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/nvidia.yml b/.github/workflows/nvidia.yml index 1ae3a0f1a..79ed70fc9 100644 --- a/.github/workflows/nvidia.yml +++ b/.github/workflows/nvidia.yml @@ -65,7 +65,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/ollama.yml b/.github/workflows/ollama.yml index 7a6465e16..c50641425 100644 --- a/.github/workflows/ollama.yml +++ b/.github/workflows/ollama.yml @@ -81,7 +81,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/opensearch.yml b/.github/workflows/opensearch.yml index 46ce2e6a5..c2fc322d6 100644 --- a/.github/workflows/opensearch.yml +++ b/.github/workflows/opensearch.yml @@ -61,7 +61,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/optimum.yml b/.github/workflows/optimum.yml index fe0421d59..641d278f9 100644 --- a/.github/workflows/optimum.yml +++ b/.github/workflows/optimum.yml @@ -63,7 +63,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/pgvector.yml b/.github/workflows/pgvector.yml index 59422298a..5a91cab6b 100644 --- a/.github/workflows/pgvector.yml +++ b/.github/workflows/pgvector.yml @@ -67,7 +67,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/pinecone.yml b/.github/workflows/pinecone.yml index 8f963854d..12c664a55 100644 --- a/.github/workflows/pinecone.yml +++ b/.github/workflows/pinecone.yml @@ -69,7 +69,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/qdrant.yml b/.github/workflows/qdrant.yml index 5e17c16cb..d239dce48 100644 --- a/.github/workflows/qdrant.yml +++ b/.github/workflows/qdrant.yml @@ -63,7 +63,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/ragas.yml b/.github/workflows/ragas.yml index de53abd94..cbc6fdfad 100644 --- a/.github/workflows/ragas.yml +++ b/.github/workflows/ragas.yml @@ -64,7 +64,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/unstructured.yml b/.github/workflows/unstructured.yml index c1eb0b4ea..d523967d5 100644 --- a/.github/workflows/unstructured.yml +++ b/.github/workflows/unstructured.yml @@ -75,7 +75,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/weaviate.yml b/.github/workflows/weaviate.yml index 8e1bbbc4f..00c4a4792 100644 --- a/.github/workflows/weaviate.yml +++ b/.github/workflows/weaviate.yml @@ -60,7 +60,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run test -m "not integration" + hatch run cov -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/integrations/amazon_bedrock/pyproject.toml b/integrations/amazon_bedrock/pyproject.toml index 2a4f88960..0669d8001 100644 --- a/integrations/amazon_bedrock/pyproject.toml +++ b/integrations/amazon_bedrock/pyproject.toml @@ -49,8 +49,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/amazon_sagemaker/pyproject.toml b/integrations/amazon_sagemaker/pyproject.toml index 40a2a1b16..4fd246ed0 100644 --- a/integrations/amazon_sagemaker/pyproject.toml +++ b/integrations/amazon_sagemaker/pyproject.toml @@ -52,8 +52,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] diff --git a/integrations/anthropic/pyproject.toml b/integrations/anthropic/pyproject.toml index e5cfdcbce..0a7b4ee1f 100644 --- a/integrations/anthropic/pyproject.toml +++ b/integrations/anthropic/pyproject.toml @@ -49,8 +49,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/astra/pyproject.toml b/integrations/astra/pyproject.toml index 9bbf8e07b..e3f949567 100644 --- a/integrations/astra/pyproject.toml +++ b/integrations/astra/pyproject.toml @@ -48,8 +48,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/chroma/pyproject.toml b/integrations/chroma/pyproject.toml index 12a4a4b2b..2b639f8b2 100644 --- a/integrations/chroma/pyproject.toml +++ b/integrations/chroma/pyproject.toml @@ -49,8 +49,8 @@ dependencies = [ "databind-core<4.5.0", # FIXME: the latest 4.5.0 causes loops in pip resolver ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/cohere/pyproject.toml b/integrations/cohere/pyproject.toml index 4d1ab36dd..aa9c25769 100644 --- a/integrations/cohere/pyproject.toml +++ b/integrations/cohere/pyproject.toml @@ -43,8 +43,8 @@ git_describe_command = 'git describe --tags --match="integrations/cohere-v[0-9]* [tool.hatch.envs.default] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/deepeval/pyproject.toml b/integrations/deepeval/pyproject.toml index 4e93c6c41..ae7792cb0 100644 --- a/integrations/deepeval/pyproject.toml +++ b/integrations/deepeval/pyproject.toml @@ -43,8 +43,8 @@ git_describe_command = 'git describe --tags --match="integrations/deepeval-v[0-9 [tool.hatch.envs.default] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/elasticsearch/pyproject.toml b/integrations/elasticsearch/pyproject.toml index 87bf5a167..8e3f745a3 100644 --- a/integrations/elasticsearch/pyproject.toml +++ b/integrations/elasticsearch/pyproject.toml @@ -49,8 +49,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/fastembed/pyproject.toml b/integrations/fastembed/pyproject.toml index b0a367ee4..3de3ae91a 100644 --- a/integrations/fastembed/pyproject.toml +++ b/integrations/fastembed/pyproject.toml @@ -50,8 +50,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/google_ai/pyproject.toml b/integrations/google_ai/pyproject.toml index 3a2382477..a28b7df78 100644 --- a/integrations/google_ai/pyproject.toml +++ b/integrations/google_ai/pyproject.toml @@ -48,8 +48,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/google_vertex/pyproject.toml b/integrations/google_vertex/pyproject.toml index 81d22c21b..84ef2db5e 100644 --- a/integrations/google_vertex/pyproject.toml +++ b/integrations/google_vertex/pyproject.toml @@ -48,8 +48,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/instructor_embedders/pyproject.toml b/integrations/instructor_embedders/pyproject.toml index 47afee31f..a2327ba4e 100644 --- a/integrations/instructor_embedders/pyproject.toml +++ b/integrations/instructor_embedders/pyproject.toml @@ -71,8 +71,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/jina/pyproject.toml b/integrations/jina/pyproject.toml index 494d7d1ea..ace2b3192 100644 --- a/integrations/jina/pyproject.toml +++ b/integrations/jina/pyproject.toml @@ -45,8 +45,8 @@ git_describe_command = 'git describe --tags --match="integrations/jina-v[0-9]*"' [tool.hatch.envs.default] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/langfuse/pyproject.toml b/integrations/langfuse/pyproject.toml index 41b1c1da9..d696eb05b 100644 --- a/integrations/langfuse/pyproject.toml +++ b/integrations/langfuse/pyproject.toml @@ -49,8 +49,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/llama_cpp/pyproject.toml b/integrations/llama_cpp/pyproject.toml index e84b20d16..ee134f789 100644 --- a/integrations/llama_cpp/pyproject.toml +++ b/integrations/llama_cpp/pyproject.toml @@ -53,8 +53,8 @@ dependencies = [ "transformers[sentencepiece]", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/mistral/pyproject.toml b/integrations/mistral/pyproject.toml index abef1d747..f8156c66d 100644 --- a/integrations/mistral/pyproject.toml +++ b/integrations/mistral/pyproject.toml @@ -43,8 +43,8 @@ git_describe_command = 'git describe --tags --match="integrations/mistral-v[0-9] [tool.hatch.envs.default] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/mongodb_atlas/pyproject.toml b/integrations/mongodb_atlas/pyproject.toml index 9fdfa3385..5729296e4 100644 --- a/integrations/mongodb_atlas/pyproject.toml +++ b/integrations/mongodb_atlas/pyproject.toml @@ -50,8 +50,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/nvidia/pyproject.toml b/integrations/nvidia/pyproject.toml index 504077b4e..bff66d9b3 100644 --- a/integrations/nvidia/pyproject.toml +++ b/integrations/nvidia/pyproject.toml @@ -44,8 +44,8 @@ git_describe_command = 'git describe --tags --match="integrations/nvidia-v[0-9]* [tool.hatch.envs.default] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/ollama/pyproject.toml b/integrations/ollama/pyproject.toml index 3b7119dfd..382f0cdaa 100644 --- a/integrations/ollama/pyproject.toml +++ b/integrations/ollama/pyproject.toml @@ -53,8 +53,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/opensearch/pyproject.toml b/integrations/opensearch/pyproject.toml index 842b46415..3f7d5595d 100644 --- a/integrations/opensearch/pyproject.toml +++ b/integrations/opensearch/pyproject.toml @@ -50,8 +50,8 @@ dependencies = [ "boto3", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] diff --git a/integrations/optimum/pyproject.toml b/integrations/optimum/pyproject.toml index d5d00c2cf..74c529532 100644 --- a/integrations/optimum/pyproject.toml +++ b/integrations/optimum/pyproject.toml @@ -63,8 +63,8 @@ dependencies = [ "setuptools", # FIXME: the latest 4.5.0 causes loops in pip resolver ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/pgvector/pyproject.toml b/integrations/pgvector/pyproject.toml index 10d00606f..a5b995634 100644 --- a/integrations/pgvector/pyproject.toml +++ b/integrations/pgvector/pyproject.toml @@ -50,8 +50,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/pinecone/pyproject.toml b/integrations/pinecone/pyproject.toml index ab764589b..180d3dedd 100644 --- a/integrations/pinecone/pyproject.toml +++ b/integrations/pinecone/pyproject.toml @@ -54,8 +54,8 @@ dependencies = [ [tool.hatch.envs.default.scripts] # Pinecone tests are slow (require HTTP requests), so we run them in parallel # with pytest-xdist (https://pytest-xdist.readthedocs.io/en/stable/distribution.html) -test = "pytest -n auto --maxprocesses=2 --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest -n auto --maxprocesses=2 --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest -n auto --maxprocesses=2 -x {args:tests}" +test-cov = "coverage run -m pytest -n auto --maxprocesses=2 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/qdrant/pyproject.toml b/integrations/qdrant/pyproject.toml index d43926417..10e149239 100644 --- a/integrations/qdrant/pyproject.toml +++ b/integrations/qdrant/pyproject.toml @@ -46,8 +46,8 @@ git_describe_command = 'git describe --tags --match="integrations/qdrant-v[0-9]* [tool.hatch.envs.default] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/ragas/pyproject.toml b/integrations/ragas/pyproject.toml index 3a32d27a7..003aea32f 100644 --- a/integrations/ragas/pyproject.toml +++ b/integrations/ragas/pyproject.toml @@ -43,8 +43,8 @@ git_describe_command = 'git describe --tags --match="integrations/ragas-v[0-9]*" [tool.hatch.envs.default] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools", "pytest-asyncio"] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/unstructured/pyproject.toml b/integrations/unstructured/pyproject.toml index d00f60e3a..c93f6f3aa 100644 --- a/integrations/unstructured/pyproject.toml +++ b/integrations/unstructured/pyproject.toml @@ -48,8 +48,8 @@ dependencies = [ "haystack-pydoc-tools", ] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/weaviate/pyproject.toml b/integrations/weaviate/pyproject.toml index b0aa15143..cdd152d86 100644 --- a/integrations/weaviate/pyproject.toml +++ b/integrations/weaviate/pyproject.toml @@ -49,8 +49,8 @@ git_describe_command = 'git describe --tags --match="integrations/weaviate-v[0-9 [tool.hatch.envs.default] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "ipython"] [tool.hatch.envs.default.scripts] -test = "pytest --reruns 3 --reruns-delay 30 -x {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test = "pytest {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] From 8a85dc6de000c7997be7d4d194424a84c4c31ba8 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Tue, 6 Aug 2024 19:02:58 +0200 Subject: [PATCH 2/3] fix --- integrations/amazon_bedrock/pyproject.toml | 2 +- integrations/amazon_sagemaker/pyproject.toml | 2 +- integrations/anthropic/pyproject.toml | 2 +- integrations/astra/pyproject.toml | 2 +- integrations/chroma/pyproject.toml | 2 +- integrations/cohere/pyproject.toml | 2 +- integrations/deepeval/pyproject.toml | 2 +- integrations/elasticsearch/pyproject.toml | 2 +- integrations/fastembed/pyproject.toml | 2 +- integrations/google_ai/pyproject.toml | 2 +- integrations/google_vertex/pyproject.toml | 2 +- integrations/instructor_embedders/pyproject.toml | 2 +- integrations/jina/pyproject.toml | 2 +- integrations/langfuse/pyproject.toml | 2 +- integrations/llama_cpp/pyproject.toml | 2 +- integrations/mistral/pyproject.toml | 2 +- integrations/mongodb_atlas/pyproject.toml | 2 +- integrations/nvidia/pyproject.toml | 2 +- integrations/ollama/pyproject.toml | 2 +- integrations/opensearch/pyproject.toml | 2 +- integrations/optimum/pyproject.toml | 2 +- integrations/pgvector/pyproject.toml | 2 +- integrations/pinecone/pyproject.toml | 2 +- integrations/qdrant/pyproject.toml | 2 +- integrations/ragas/pyproject.toml | 2 +- integrations/unstructured/pyproject.toml | 2 +- integrations/weaviate/pyproject.toml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/integrations/amazon_bedrock/pyproject.toml b/integrations/amazon_bedrock/pyproject.toml index 0669d8001..774eb5592 100644 --- a/integrations/amazon_bedrock/pyproject.toml +++ b/integrations/amazon_bedrock/pyproject.toml @@ -50,7 +50,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/amazon_sagemaker/pyproject.toml b/integrations/amazon_sagemaker/pyproject.toml index 4fd246ed0..c3049d79f 100644 --- a/integrations/amazon_sagemaker/pyproject.toml +++ b/integrations/amazon_sagemaker/pyproject.toml @@ -53,7 +53,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] diff --git a/integrations/anthropic/pyproject.toml b/integrations/anthropic/pyproject.toml index 0a7b4ee1f..e2023daf0 100644 --- a/integrations/anthropic/pyproject.toml +++ b/integrations/anthropic/pyproject.toml @@ -50,7 +50,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/astra/pyproject.toml b/integrations/astra/pyproject.toml index e3f949567..ae573c3c2 100644 --- a/integrations/astra/pyproject.toml +++ b/integrations/astra/pyproject.toml @@ -49,7 +49,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/chroma/pyproject.toml b/integrations/chroma/pyproject.toml index 2b639f8b2..8698637b0 100644 --- a/integrations/chroma/pyproject.toml +++ b/integrations/chroma/pyproject.toml @@ -50,7 +50,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/cohere/pyproject.toml b/integrations/cohere/pyproject.toml index aa9c25769..dc5e4c5e1 100644 --- a/integrations/cohere/pyproject.toml +++ b/integrations/cohere/pyproject.toml @@ -44,7 +44,7 @@ git_describe_command = 'git describe --tags --match="integrations/cohere-v[0-9]* dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/deepeval/pyproject.toml b/integrations/deepeval/pyproject.toml index ae7792cb0..9c9a1e2e7 100644 --- a/integrations/deepeval/pyproject.toml +++ b/integrations/deepeval/pyproject.toml @@ -44,7 +44,7 @@ git_describe_command = 'git describe --tags --match="integrations/deepeval-v[0-9 dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/elasticsearch/pyproject.toml b/integrations/elasticsearch/pyproject.toml index 8e3f745a3..b4e916655 100644 --- a/integrations/elasticsearch/pyproject.toml +++ b/integrations/elasticsearch/pyproject.toml @@ -50,7 +50,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/fastembed/pyproject.toml b/integrations/fastembed/pyproject.toml index 3de3ae91a..907068d81 100644 --- a/integrations/fastembed/pyproject.toml +++ b/integrations/fastembed/pyproject.toml @@ -51,7 +51,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/google_ai/pyproject.toml b/integrations/google_ai/pyproject.toml index a28b7df78..71cf15cb2 100644 --- a/integrations/google_ai/pyproject.toml +++ b/integrations/google_ai/pyproject.toml @@ -49,7 +49,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/google_vertex/pyproject.toml b/integrations/google_vertex/pyproject.toml index 84ef2db5e..27046cf6f 100644 --- a/integrations/google_vertex/pyproject.toml +++ b/integrations/google_vertex/pyproject.toml @@ -49,7 +49,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/instructor_embedders/pyproject.toml b/integrations/instructor_embedders/pyproject.toml index a2327ba4e..48592d285 100644 --- a/integrations/instructor_embedders/pyproject.toml +++ b/integrations/instructor_embedders/pyproject.toml @@ -72,7 +72,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/jina/pyproject.toml b/integrations/jina/pyproject.toml index ace2b3192..3d1359ff8 100644 --- a/integrations/jina/pyproject.toml +++ b/integrations/jina/pyproject.toml @@ -46,7 +46,7 @@ git_describe_command = 'git describe --tags --match="integrations/jina-v[0-9]*"' dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/langfuse/pyproject.toml b/integrations/langfuse/pyproject.toml index d696eb05b..dd737001c 100644 --- a/integrations/langfuse/pyproject.toml +++ b/integrations/langfuse/pyproject.toml @@ -50,7 +50,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/llama_cpp/pyproject.toml b/integrations/llama_cpp/pyproject.toml index ee134f789..7394d9e10 100644 --- a/integrations/llama_cpp/pyproject.toml +++ b/integrations/llama_cpp/pyproject.toml @@ -54,7 +54,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/mistral/pyproject.toml b/integrations/mistral/pyproject.toml index f8156c66d..662663dba 100644 --- a/integrations/mistral/pyproject.toml +++ b/integrations/mistral/pyproject.toml @@ -44,7 +44,7 @@ git_describe_command = 'git describe --tags --match="integrations/mistral-v[0-9] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/mongodb_atlas/pyproject.toml b/integrations/mongodb_atlas/pyproject.toml index 5729296e4..bf8439292 100644 --- a/integrations/mongodb_atlas/pyproject.toml +++ b/integrations/mongodb_atlas/pyproject.toml @@ -51,7 +51,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/nvidia/pyproject.toml b/integrations/nvidia/pyproject.toml index bff66d9b3..34241d0d8 100644 --- a/integrations/nvidia/pyproject.toml +++ b/integrations/nvidia/pyproject.toml @@ -45,7 +45,7 @@ git_describe_command = 'git describe --tags --match="integrations/nvidia-v[0-9]* dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/ollama/pyproject.toml b/integrations/ollama/pyproject.toml index 382f0cdaa..b6a86c51a 100644 --- a/integrations/ollama/pyproject.toml +++ b/integrations/ollama/pyproject.toml @@ -54,7 +54,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/opensearch/pyproject.toml b/integrations/opensearch/pyproject.toml index 3f7d5595d..493b12f99 100644 --- a/integrations/opensearch/pyproject.toml +++ b/integrations/opensearch/pyproject.toml @@ -51,7 +51,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] diff --git a/integrations/optimum/pyproject.toml b/integrations/optimum/pyproject.toml index 74c529532..df2c83581 100644 --- a/integrations/optimum/pyproject.toml +++ b/integrations/optimum/pyproject.toml @@ -64,7 +64,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/pgvector/pyproject.toml b/integrations/pgvector/pyproject.toml index a5b995634..3bc0f3ebd 100644 --- a/integrations/pgvector/pyproject.toml +++ b/integrations/pgvector/pyproject.toml @@ -51,7 +51,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/pinecone/pyproject.toml b/integrations/pinecone/pyproject.toml index 180d3dedd..6912946d1 100644 --- a/integrations/pinecone/pyproject.toml +++ b/integrations/pinecone/pyproject.toml @@ -55,7 +55,7 @@ dependencies = [ # Pinecone tests are slow (require HTTP requests), so we run them in parallel # with pytest-xdist (https://pytest-xdist.readthedocs.io/en/stable/distribution.html) test = "pytest -n auto --maxprocesses=2 -x {args:tests}" -test-cov = "coverage run -m pytest -n auto --maxprocesses=2 -x {args:tests}" +test-cov = "coverage run -m pytest -n auto --maxprocesses=2 --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/qdrant/pyproject.toml b/integrations/qdrant/pyproject.toml index 10e149239..6eb25b141 100644 --- a/integrations/qdrant/pyproject.toml +++ b/integrations/qdrant/pyproject.toml @@ -47,7 +47,7 @@ git_describe_command = 'git describe --tags --match="integrations/qdrant-v[0-9]* dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/ragas/pyproject.toml b/integrations/ragas/pyproject.toml index 003aea32f..e7022f495 100644 --- a/integrations/ragas/pyproject.toml +++ b/integrations/ragas/pyproject.toml @@ -44,7 +44,7 @@ git_describe_command = 'git describe --tags --match="integrations/ragas-v[0-9]*" dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools", "pytest-asyncio"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/unstructured/pyproject.toml b/integrations/unstructured/pyproject.toml index c93f6f3aa..5b2882e99 100644 --- a/integrations/unstructured/pyproject.toml +++ b/integrations/unstructured/pyproject.toml @@ -49,7 +49,7 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/weaviate/pyproject.toml b/integrations/weaviate/pyproject.toml index cdd152d86..bf07ec756 100644 --- a/integrations/weaviate/pyproject.toml +++ b/integrations/weaviate/pyproject.toml @@ -50,7 +50,7 @@ git_describe_command = 'git describe --tags --match="integrations/weaviate-v[0-9 dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "ipython"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest {args:tests}" +test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] From fbf995609fccda35b94bb97d0e4317a35f0c8f3d Mon Sep 17 00:00:00 2001 From: anakin87 Date: Wed, 7 Aug 2024 11:12:55 +0200 Subject: [PATCH 3/3] hatch config improvements --- .github/workflows/amazon_bedrock.yml | 6 +++--- .github/workflows/amazon_sagemaker.yml | 4 ++-- .github/workflows/anthropic.yml | 4 ++-- .github/workflows/astra.yml | 4 ++-- .github/workflows/chroma.yml | 4 ++-- .github/workflows/cohere.yml | 4 ++-- .github/workflows/deepeval.yml | 4 ++-- .github/workflows/elasticsearch.yml | 4 ++-- .github/workflows/fastembed.yml | 4 ++-- .github/workflows/google_ai.yml | 4 ++-- .github/workflows/google_vertex.yml | 4 ++-- .github/workflows/instructor_embedders.yml | 4 ++-- .github/workflows/jina.yml | 4 ++-- .github/workflows/langfuse.yml | 4 ++-- .github/workflows/llama_cpp.yml | 4 ++-- .github/workflows/mistral.yml | 4 ++-- .github/workflows/mongodb_atlas.yml | 4 ++-- .github/workflows/nvidia.yml | 4 ++-- .github/workflows/ollama.yml | 4 ++-- .github/workflows/opensearch.yml | 4 ++-- .github/workflows/optimum.yml | 4 ++-- .github/workflows/pgvector.yml | 4 ++-- .github/workflows/pinecone.yml | 4 ++-- .github/workflows/qdrant.yml | 4 ++-- .github/workflows/ragas.yml | 4 ++-- .github/workflows/unstructured.yml | 4 ++-- .github/workflows/weaviate.yml | 4 ++-- integrations/amazon_bedrock/pyproject.toml | 4 +++- integrations/amazon_sagemaker/pyproject.toml | 4 +++- integrations/anthropic/pyproject.toml | 4 +++- integrations/astra/pyproject.toml | 4 +++- integrations/chroma/pyproject.toml | 4 +++- integrations/cohere/pyproject.toml | 4 +++- integrations/deepeval/pyproject.toml | 4 +++- integrations/elasticsearch/pyproject.toml | 4 +++- integrations/fastembed/pyproject.toml | 4 +++- integrations/google_ai/pyproject.toml | 4 +++- integrations/google_vertex/pyproject.toml | 4 +++- integrations/instructor_embedders/pyproject.toml | 4 +++- integrations/jina/pyproject.toml | 4 +++- integrations/langfuse/pyproject.toml | 4 +++- integrations/llama_cpp/pyproject.toml | 4 +++- integrations/mistral/pyproject.toml | 4 +++- integrations/mongodb_atlas/pyproject.toml | 4 +++- integrations/nvidia/pyproject.toml | 4 +++- integrations/ollama/pyproject.toml | 4 +++- integrations/opensearch/pyproject.toml | 4 +++- integrations/optimum/pyproject.toml | 4 +++- integrations/pgvector/pyproject.toml | 4 +++- integrations/pinecone/pyproject.toml | 4 +++- integrations/qdrant/pyproject.toml | 4 +++- integrations/ragas/pyproject.toml | 4 +++- integrations/unstructured/pyproject.toml | 4 +++- integrations/weaviate/pyproject.toml | 4 +++- 54 files changed, 136 insertions(+), 82 deletions(-) diff --git a/.github/workflows/amazon_bedrock.yml b/.github/workflows/amazon_bedrock.yml index a91a37657..2057d4bdf 100644 --- a/.github/workflows/amazon_bedrock.yml +++ b/.github/workflows/amazon_bedrock.yml @@ -63,7 +63,7 @@ jobs: run: hatch run docs - name: Run unit tests - run: hatch run cov -m "not integration" + run: hatch run cov-retry -m "not integration" # Do not authenticate on pull requests from forks - name: AWS authentication @@ -76,13 +76,13 @@ jobs: # Do not run integration tests on pull requests from forks - name: Run integration tests if: github.event.pull_request.head.repo.full_name == github.repository - run: hatch run cov -m "integration" + run: hatch run cov-retry -m "integration" - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/amazon_sagemaker.yml b/.github/workflows/amazon_sagemaker.yml index c68f566e3..ed0a571e6 100644 --- a/.github/workflows/amazon_sagemaker.yml +++ b/.github/workflows/amazon_sagemaker.yml @@ -57,13 +57,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/anthropic.yml b/.github/workflows/anthropic.yml index 997c2fba4..c4cdeb2d1 100644 --- a/.github/workflows/anthropic.yml +++ b/.github/workflows/anthropic.yml @@ -54,13 +54,13 @@ jobs: run: hatch run lint:all - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/astra.yml b/.github/workflows/astra.yml index 6f375a32b..dcfc00c75 100644 --- a/.github/workflows/astra.yml +++ b/.github/workflows/astra.yml @@ -61,13 +61,13 @@ jobs: env: ASTRA_DB_API_ENDPOINT: ${{ secrets.ASTRA_DB_API_ENDPOINT }} ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }} - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/chroma.yml b/.github/workflows/chroma.yml index bb3a8e4d1..26b6287bd 100644 --- a/.github/workflows/chroma.yml +++ b/.github/workflows/chroma.yml @@ -57,13 +57,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/cohere.yml b/.github/workflows/cohere.yml index bb57b3e90..00a8ee2ed 100644 --- a/.github/workflows/cohere.yml +++ b/.github/workflows/cohere.yml @@ -58,13 +58,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/deepeval.yml b/.github/workflows/deepeval.yml index 5a4563f3f..23de1a3f4 100644 --- a/.github/workflows/deepeval.yml +++ b/.github/workflows/deepeval.yml @@ -58,13 +58,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml index 295fab3c9..476e832b5 100644 --- a/.github/workflows/elasticsearch.yml +++ b/.github/workflows/elasticsearch.yml @@ -55,13 +55,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/fastembed.yml b/.github/workflows/fastembed.yml index 7563f13c6..e389bf3a4 100644 --- a/.github/workflows/fastembed.yml +++ b/.github/workflows/fastembed.yml @@ -42,13 +42,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/google_ai.yml b/.github/workflows/google_ai.yml index 1540705d6..1b4b2e496 100644 --- a/.github/workflows/google_ai.yml +++ b/.github/workflows/google_ai.yml @@ -58,13 +58,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/google_vertex.yml b/.github/workflows/google_vertex.yml index bc2661026..78ba5694b 100644 --- a/.github/workflows/google_vertex.yml +++ b/.github/workflows/google_vertex.yml @@ -57,13 +57,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/instructor_embedders.yml b/.github/workflows/instructor_embedders.yml index e797f3f41..f12f4d696 100644 --- a/.github/workflows/instructor_embedders.yml +++ b/.github/workflows/instructor_embedders.yml @@ -35,13 +35,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/jina.yml b/.github/workflows/jina.yml index eae7b9224..00af6eb45 100644 --- a/.github/workflows/jina.yml +++ b/.github/workflows/jina.yml @@ -57,13 +57,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/langfuse.yml b/.github/workflows/langfuse.yml index 2576620f2..8a10cf241 100644 --- a/.github/workflows/langfuse.yml +++ b/.github/workflows/langfuse.yml @@ -60,13 +60,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/llama_cpp.yml b/.github/workflows/llama_cpp.yml index 6890b9b82..a9480ca96 100644 --- a/.github/workflows/llama_cpp.yml +++ b/.github/workflows/llama_cpp.yml @@ -57,13 +57,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/mistral.yml b/.github/workflows/mistral.yml index c3165dc38..e62008906 100644 --- a/.github/workflows/mistral.yml +++ b/.github/workflows/mistral.yml @@ -58,13 +58,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/mongodb_atlas.yml b/.github/workflows/mongodb_atlas.yml index 0796bf917..3d1ad5101 100644 --- a/.github/workflows/mongodb_atlas.yml +++ b/.github/workflows/mongodb_atlas.yml @@ -54,13 +54,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/nvidia.yml b/.github/workflows/nvidia.yml index 79ed70fc9..0d39a4d91 100644 --- a/.github/workflows/nvidia.yml +++ b/.github/workflows/nvidia.yml @@ -55,7 +55,7 @@ jobs: run: hatch run lint:all - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Generate docs if: matrix.python-version == '3.9' && runner.os == 'Linux' @@ -65,7 +65,7 @@ jobs: if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/ollama.yml b/.github/workflows/ollama.yml index c50641425..43af485b7 100644 --- a/.github/workflows/ollama.yml +++ b/.github/workflows/ollama.yml @@ -75,13 +75,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/opensearch.yml b/.github/workflows/opensearch.yml index c2fc322d6..48169a75f 100644 --- a/.github/workflows/opensearch.yml +++ b/.github/workflows/opensearch.yml @@ -55,13 +55,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/optimum.yml b/.github/workflows/optimum.yml index 641d278f9..c33baa7f8 100644 --- a/.github/workflows/optimum.yml +++ b/.github/workflows/optimum.yml @@ -57,13 +57,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/pgvector.yml b/.github/workflows/pgvector.yml index 5a91cab6b..0fe20e037 100644 --- a/.github/workflows/pgvector.yml +++ b/.github/workflows/pgvector.yml @@ -61,13 +61,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/pinecone.yml b/.github/workflows/pinecone.yml index 12c664a55..9e143005b 100644 --- a/.github/workflows/pinecone.yml +++ b/.github/workflows/pinecone.yml @@ -63,13 +63,13 @@ jobs: - name: Run tests env: INDEX_NAME: ${{ matrix.INDEX_NAME }} - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/qdrant.yml b/.github/workflows/qdrant.yml index d239dce48..116225b2d 100644 --- a/.github/workflows/qdrant.yml +++ b/.github/workflows/qdrant.yml @@ -57,13 +57,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/ragas.yml b/.github/workflows/ragas.yml index cbc6fdfad..c4757e704 100644 --- a/.github/workflows/ragas.yml +++ b/.github/workflows/ragas.yml @@ -58,13 +58,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/unstructured.yml b/.github/workflows/unstructured.yml index d523967d5..e4b640275 100644 --- a/.github/workflows/unstructured.yml +++ b/.github/workflows/unstructured.yml @@ -69,13 +69,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/.github/workflows/weaviate.yml b/.github/workflows/weaviate.yml index 00c4a4792..5e29eafe7 100644 --- a/.github/workflows/weaviate.yml +++ b/.github/workflows/weaviate.yml @@ -54,13 +54,13 @@ jobs: run: hatch run docs - name: Run tests - run: hatch run cov + run: hatch run cov-retry - name: Nightly - run unit tests with Haystack main branch if: github.event_name == 'schedule' run: | hatch run pip install git+https://github.com/deepset-ai/haystack.git - hatch run cov -m "not integration" + hatch run cov-retry -m "not integration" - name: Send event to Datadog for nightly failures if: failure() && github.event_name == 'schedule' diff --git a/integrations/amazon_bedrock/pyproject.toml b/integrations/amazon_bedrock/pyproject.toml index 774eb5592..f4a410dbd 100644 --- a/integrations/amazon_bedrock/pyproject.toml +++ b/integrations/amazon_bedrock/pyproject.toml @@ -50,9 +50,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] python = ["3.8", "3.9", "3.10", "3.11", "3.12"] diff --git a/integrations/amazon_sagemaker/pyproject.toml b/integrations/amazon_sagemaker/pyproject.toml index c3049d79f..f8050bb48 100644 --- a/integrations/amazon_sagemaker/pyproject.toml +++ b/integrations/amazon_sagemaker/pyproject.toml @@ -53,9 +53,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/anthropic/pyproject.toml b/integrations/anthropic/pyproject.toml index e2023daf0..3f8c9812b 100644 --- a/integrations/anthropic/pyproject.toml +++ b/integrations/anthropic/pyproject.toml @@ -50,9 +50,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] python = ["3.8", "3.9", "3.10", "3.11", "3.12"] diff --git a/integrations/astra/pyproject.toml b/integrations/astra/pyproject.toml index ae573c3c2..7d543ddc9 100644 --- a/integrations/astra/pyproject.toml +++ b/integrations/astra/pyproject.toml @@ -49,9 +49,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] python = ["3.8", "3.9", "3.10", "3.11"] diff --git a/integrations/chroma/pyproject.toml b/integrations/chroma/pyproject.toml index 8698637b0..b4591e041 100644 --- a/integrations/chroma/pyproject.toml +++ b/integrations/chroma/pyproject.toml @@ -50,9 +50,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/cohere/pyproject.toml b/integrations/cohere/pyproject.toml index dc5e4c5e1..04fe15585 100644 --- a/integrations/cohere/pyproject.toml +++ b/integrations/cohere/pyproject.toml @@ -44,9 +44,11 @@ git_describe_command = 'git describe --tags --match="integrations/cohere-v[0-9]* dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/deepeval/pyproject.toml b/integrations/deepeval/pyproject.toml index 9c9a1e2e7..44d89cb11 100644 --- a/integrations/deepeval/pyproject.toml +++ b/integrations/deepeval/pyproject.toml @@ -44,9 +44,11 @@ git_describe_command = 'git describe --tags --match="integrations/deepeval-v[0-9 dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/elasticsearch/pyproject.toml b/integrations/elasticsearch/pyproject.toml index b4e916655..cb9281030 100644 --- a/integrations/elasticsearch/pyproject.toml +++ b/integrations/elasticsearch/pyproject.toml @@ -50,9 +50,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/fastembed/pyproject.toml b/integrations/fastembed/pyproject.toml index 907068d81..9afd344c9 100644 --- a/integrations/fastembed/pyproject.toml +++ b/integrations/fastembed/pyproject.toml @@ -51,9 +51,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/google_ai/pyproject.toml b/integrations/google_ai/pyproject.toml index 71cf15cb2..db958a487 100644 --- a/integrations/google_ai/pyproject.toml +++ b/integrations/google_ai/pyproject.toml @@ -49,9 +49,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] python = ["3.8", "3.9", "3.10", "3.11"] diff --git a/integrations/google_vertex/pyproject.toml b/integrations/google_vertex/pyproject.toml index 27046cf6f..747bbecbf 100644 --- a/integrations/google_vertex/pyproject.toml +++ b/integrations/google_vertex/pyproject.toml @@ -49,9 +49,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] python = ["3.8", "3.9", "3.10", "3.11"] diff --git a/integrations/instructor_embedders/pyproject.toml b/integrations/instructor_embedders/pyproject.toml index 48592d285..0543a9a88 100644 --- a/integrations/instructor_embedders/pyproject.toml +++ b/integrations/instructor_embedders/pyproject.toml @@ -72,9 +72,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.test.matrix]] diff --git a/integrations/jina/pyproject.toml b/integrations/jina/pyproject.toml index 3d1359ff8..fa2fd50ed 100644 --- a/integrations/jina/pyproject.toml +++ b/integrations/jina/pyproject.toml @@ -46,9 +46,11 @@ git_describe_command = 'git describe --tags --match="integrations/jina-v[0-9]*"' dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/langfuse/pyproject.toml b/integrations/langfuse/pyproject.toml index dd737001c..cf7b85b64 100644 --- a/integrations/langfuse/pyproject.toml +++ b/integrations/langfuse/pyproject.toml @@ -50,9 +50,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/llama_cpp/pyproject.toml b/integrations/llama_cpp/pyproject.toml index 7394d9e10..67b87da36 100644 --- a/integrations/llama_cpp/pyproject.toml +++ b/integrations/llama_cpp/pyproject.toml @@ -54,9 +54,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] python = ["3.8", "3.9", "3.10", "3.11", "3.12"] diff --git a/integrations/mistral/pyproject.toml b/integrations/mistral/pyproject.toml index 662663dba..bcb4f5999 100644 --- a/integrations/mistral/pyproject.toml +++ b/integrations/mistral/pyproject.toml @@ -44,9 +44,11 @@ git_describe_command = 'git describe --tags --match="integrations/mistral-v[0-9] dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/mongodb_atlas/pyproject.toml b/integrations/mongodb_atlas/pyproject.toml index bf8439292..170f6e94d 100644 --- a/integrations/mongodb_atlas/pyproject.toml +++ b/integrations/mongodb_atlas/pyproject.toml @@ -51,9 +51,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/nvidia/pyproject.toml b/integrations/nvidia/pyproject.toml index 34241d0d8..268360b0f 100644 --- a/integrations/nvidia/pyproject.toml +++ b/integrations/nvidia/pyproject.toml @@ -45,9 +45,11 @@ git_describe_command = 'git describe --tags --match="integrations/nvidia-v[0-9]* dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/ollama/pyproject.toml b/integrations/ollama/pyproject.toml index b6a86c51a..5187de31f 100644 --- a/integrations/ollama/pyproject.toml +++ b/integrations/ollama/pyproject.toml @@ -54,9 +54,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/opensearch/pyproject.toml b/integrations/opensearch/pyproject.toml index 493b12f99..b7e5e3da6 100644 --- a/integrations/opensearch/pyproject.toml +++ b/integrations/opensearch/pyproject.toml @@ -51,9 +51,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] diff --git a/integrations/optimum/pyproject.toml b/integrations/optimum/pyproject.toml index df2c83581..2e0fb26a4 100644 --- a/integrations/optimum/pyproject.toml +++ b/integrations/optimum/pyproject.toml @@ -64,9 +64,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/pgvector/pyproject.toml b/integrations/pgvector/pyproject.toml index 3bc0f3ebd..7f31a5203 100644 --- a/integrations/pgvector/pyproject.toml +++ b/integrations/pgvector/pyproject.toml @@ -51,9 +51,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/pinecone/pyproject.toml b/integrations/pinecone/pyproject.toml index 6912946d1..866385dd3 100644 --- a/integrations/pinecone/pyproject.toml +++ b/integrations/pinecone/pyproject.toml @@ -55,9 +55,11 @@ dependencies = [ # Pinecone tests are slow (require HTTP requests), so we run them in parallel # with pytest-xdist (https://pytest-xdist.readthedocs.io/en/stable/distribution.html) test = "pytest -n auto --maxprocesses=2 -x {args:tests}" -test-cov = "coverage run -m pytest -n auto --maxprocesses=2 --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest -n auto --maxprocesses=2 {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/qdrant/pyproject.toml b/integrations/qdrant/pyproject.toml index 6eb25b141..8b9c44cc7 100644 --- a/integrations/qdrant/pyproject.toml +++ b/integrations/qdrant/pyproject.toml @@ -47,9 +47,11 @@ git_describe_command = 'git describe --tags --match="integrations/qdrant-v[0-9]* dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/ragas/pyproject.toml b/integrations/ragas/pyproject.toml index e7022f495..edc33eee1 100644 --- a/integrations/ragas/pyproject.toml +++ b/integrations/ragas/pyproject.toml @@ -44,9 +44,11 @@ git_describe_command = 'git describe --tags --match="integrations/ragas-v[0-9]*" dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "haystack-pydoc-tools", "pytest-asyncio"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/unstructured/pyproject.toml b/integrations/unstructured/pyproject.toml index 5b2882e99..b5de6c66a 100644 --- a/integrations/unstructured/pyproject.toml +++ b/integrations/unstructured/pyproject.toml @@ -49,9 +49,11 @@ dependencies = [ ] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]] diff --git a/integrations/weaviate/pyproject.toml b/integrations/weaviate/pyproject.toml index bf07ec756..14b60fe12 100644 --- a/integrations/weaviate/pyproject.toml +++ b/integrations/weaviate/pyproject.toml @@ -50,9 +50,11 @@ git_describe_command = 'git describe --tags --match="integrations/weaviate-v[0-9 dependencies = ["coverage[toml]>=6.5", "pytest", "pytest-rerunfailures", "ipython"] [tool.hatch.envs.default.scripts] test = "pytest {args:tests}" -test-cov = "coverage run -m pytest --reruns 3 --reruns-delay 30 -x {args:tests}" +test-cov = "coverage run -m pytest {args:tests}" +test-cov-retry = "test-cov --reruns 3 --reruns-delay 30 -x" cov-report = ["- coverage combine", "coverage report"] cov = ["test-cov", "cov-report"] +cov-retry = ["test-cov-retry", "cov-report"] docs = ["pydoc-markdown pydoc/config.yml"] [[tool.hatch.envs.all.matrix]]