diff --git a/VERSION.txt b/VERSION.txt index 77d6f4ca..4b65b3c4 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.0.0 +0.0.0.dev0 diff --git a/haystack-experimental/evaluation/__init__.py b/haystack-experimental/evaluation/__init__.py deleted file mode 100644 index c1764a6e..00000000 --- a/haystack-experimental/evaluation/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-FileCopyrightText: 2022-present deepset GmbH -# -# SPDX-License-Identifier: Apache-2.0 diff --git a/haystack-experimental/__init__.py b/haystack_experimental/components/__init__.py similarity index 100% rename from haystack-experimental/__init__.py rename to haystack_experimental/components/__init__.py diff --git a/haystack-experimental/components/__init__.py b/haystack_experimental/evaluation/__init__.py similarity index 100% rename from haystack-experimental/components/__init__.py rename to haystack_experimental/evaluation/__init__.py diff --git a/haystack-experimental/version.py b/haystack_experimental/version.py similarity index 100% rename from haystack-experimental/version.py rename to haystack_experimental/version.py diff --git a/pyproject.toml b/pyproject.toml index 722e12f4..47bdb0ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,6 @@ build-backend = "hatchling.build" [project] name = "haystack-experimental" dynamic = ["version"] -version = "0.0.0.dev0" description = "Experimental components and features for the Haystack LLM framework." readme = "README.md" license = "Apache-2.0" diff --git a/test/conftest.py b/test/conftest.py index a440a7f1..9a22109e 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -2,12 +2,9 @@ # # SPDX-License-Identifier: Apache-2.0 from pathlib import Path -from test.tracing.utils import SpyingTracer -from typing import Generator import pytest -from haystack import tracing from haystack.testing.test_utils import set_all_seeds set_all_seeds(0) @@ -16,31 +13,3 @@ @pytest.fixture() def test_files_path(): return Path(__file__).parent / "test_files" - - -@pytest.fixture(autouse=True) -def request_blocker(request: pytest.FixtureRequest, monkeypatch): - """ - This fixture is applied automatically to all tests. - Those that are not marked as integration will have the requests module - monkeypatched to avoid making HTTP requests by mistake. - """ - marker = request.node.get_closest_marker("integration") - if marker is not None: - return - - def urlopen_mock(self, method, url, *args, **kwargs): - raise RuntimeError(f"The test was about to {method} {self.scheme}://{self.host}{url}") - - monkeypatch.setattr("urllib3.connectionpool.HTTPConnectionPool.urlopen", urlopen_mock) - - -@pytest.fixture() -def spying_tracer() -> Generator[SpyingTracer, None, None]: - tracer = SpyingTracer() - tracing.enable_tracing(tracer) - - yield tracer - - # Make sure to disable tracing after the test to avoid affecting other tests - tracing.disable_tracing()