Revert sys.module modification

Author: ubmarco

tests/conftest.py

@@ -308,11 +308,6 @@ def test_app(make_app, sphinx_test_tempdir, request):
 
     app.cleanup()
 
-    # unload SN modules to prevent object leaks between test cases
-    for key in list(sys.modules.keys()):
-        if key.startswith("sphinx_needs"):
-            del sys.modules[key]
-
     # Clean up the srcdir of each Sphinx app after the test function has executed
     if request.config.getoption("--sn-build-dir") is None:
         shutil.rmtree(parent_path, ignore_errors=True)

tests/test_data.py

@@ -2,6 +2,8 @@
 import inspect
 from typing import ForwardRef
 
+from sphinx_needs.data import NeedsCoreFields, NeedsInfoType
+
 
 def test_consistent():
     """
@@ -10,8 +12,6 @@ def test_consistent():
     So at least here, we check that they are consistent with each other.
     """
     # check fields are consistent
-    from sphinx_needs.data import NeedsCoreFields, NeedsInfoType
-
     assert set(NeedsCoreFields).issubset(set(NeedsInfoType.__annotations__))
 
     # check field types are consistent with schema

tests/test_global_options.py

@@ -6,6 +6,8 @@
 from sphinx.util.console import strip_colors
 from syrupy.filters import props
 
+from sphinx_needs.config import NeedsSphinxConfig
+
 
 @pytest.mark.parametrize(
     "test_app",
@@ -19,8 +21,6 @@
     indirect=True,
 )
 def test_doc_global_option_old(test_app, snapshot):
-    from sphinx_needs.config import NeedsSphinxConfig
-
     test_app.build()
     warnings = strip_colors(
         test_app._warning.getvalue().replace(str(test_app.srcdir) + os.sep, "srcdir/")
@@ -57,8 +57,6 @@ def test_doc_global_option_old(test_app, snapshot):
     indirect=True,
 )
 def test_doc_global_option(test_app, snapshot):
-    from sphinx_needs.config import NeedsSphinxConfig
-
     test_app.build()
     warnings = strip_colors(
         test_app._warning.getvalue().replace(str(test_app.srcdir) + os.sep, "srcdir/")

tests/test_needimport.py

@@ -7,6 +7,10 @@
 from sphinx.util.console import strip_colors
 from syrupy.filters import props
 
+from sphinx_needs.data import SphinxNeedsData
+from sphinx_needs.directives.needimport import NeedimportException
+from sphinx_needs.needsfile import SphinxNeedsFileException
+
 
 @pytest.mark.parametrize(
     "test_app",
@@ -127,9 +131,6 @@ def test_need_schema_warnings(test_app, snapshot):
 )
 def test_empty_file_check(test_app):
     """Checks that an empty needs.json throws an exception"""
-
-    from sphinx_needs.needsfile import SphinxNeedsFileException
-
     app = test_app
 
     with pytest.raises(SphinxNeedsFileException):
@@ -182,8 +183,6 @@ def test_import_builder(test_app, snapshot):
     indirect=True,
 )
 def test_needimport_needs_json_download(test_app, snapshot):
-    from sphinx_needs.data import SphinxNeedsData
-
     app = test_app
 
     # Mock requests
@@ -259,8 +258,6 @@ def test_needimport_needs_json_download(test_app, snapshot):
     indirect=True,
 )
 def test_needimport_needs_json_download_negative(test_app):
-    from sphinx_needs.directives.needimport import NeedimportException
-
     with pytest.raises(NeedimportException) as err:
         test_app.build()
     assert (

tests/test_open_needs_service.py

@@ -3,6 +3,8 @@
 import pytest
 import responses
 
+from sphinx_needs.services.manager import ServiceManager
+
 MOCK_NEEDS = [
     {
         "key": "NEP_001",
@@ -69,8 +71,6 @@
     indirect=True,
 )
 def test_ons_service(test_app):
-    from sphinx_needs.services.manager import ServiceManager
-
     responses.post(
         "http://127.0.0.1:9595/auth/jwt/login",
         status=200,

tests/test_services/test_service_basics.py

@@ -4,6 +4,7 @@
 from sphinx.application import Sphinx
 
 from sphinx_needs.services.base import BaseService
+from sphinx_needs.services.manager import ServiceManager
 
 
 class ServiceTest(BaseService):
@@ -58,8 +59,6 @@ def request(self, _options):
     indirect=True,
 )
 def test_service_creation(test_app):
-    from sphinx_needs.services.manager import ServiceManager
-
     app = test_app
     app.build()
     assert isinstance(app._needs_services, ServiceManager)