refactor: use root-level imports for public symbols

runemalm · runemalm · commit 83ad835b82fd · 2025-08-20T18:29:53.000+02:00
diff --git a/scripts/test_installed_package.py b/scripts/test_installed_package.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 
 
 class Foo:
diff --git a/src/dependency_injection/__init__.py b/src/dependency_injection/__init__.py
@@ -0,0 +1,15 @@
+from .container import DependencyContainer
+from .decorator import inject
+from .tags.tagged import Tagged
+from .tags.any_tagged import AnyTagged
+from .tags.all_tagged import AllTagged
+from .version import __version__
+
+__all__ = [
+    "DependencyContainer",
+    "inject",
+    "Tagged",
+    "AnyTagged",
+    "AllTagged",
+    "__version__",
+]
diff --git a/tests/unit_test/container/configure/test_configure_default_container.py b/tests/unit_test/container/configure/test_configure_default_container.py
@@ -1,6 +1,7 @@
 import uuid
-from dependency_injection.container import DependencyContainer
+
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestConfigureDefaultContainer(UnitTestCase):
diff --git a/tests/unit_test/container/configure/test_configure_default_scope.py b/tests/unit_test/container/configure/test_configure_default_scope.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/lifecycle/test_clear_instances.py b/tests/unit_test/container/lifecycle/test_clear_instances.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/register/test_deprecations.py b/tests/unit_test/container/register/test_deprecations.py
@@ -1,9 +1,8 @@
-import warnings
-
 import pytest
+import warnings
 
-from dependency_injection.container import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestRegisterDeprecations(UnitTestCase):
diff --git a/tests/unit_test/container/register/test_register_factory.py b/tests/unit_test/container/register/test_register_factory.py
@@ -1,7 +1,7 @@
 import pytest
 
-from dependency_injection.container import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestRegisterFactory(UnitTestCase):
diff --git a/tests/unit_test/container/register/test_register_instance.py b/tests/unit_test/container/register/test_register_instance.py
@@ -1,7 +1,7 @@
 import pytest
 
-from dependency_injection.container import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestRegisterInstance(UnitTestCase):
diff --git a/tests/unit_test/container/register/test_register_scoped.py b/tests/unit_test/container/register/test_register_scoped.py
@@ -1,7 +1,7 @@
 import pytest
 
-from dependency_injection.container import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestRegisterScoped(UnitTestCase):
diff --git a/tests/unit_test/container/register/test_register_singleton.py b/tests/unit_test/container/register/test_register_singleton.py
@@ -1,7 +1,7 @@
 import pytest
 
-from dependency_injection.container import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestRegisterSingleton(UnitTestCase):
diff --git a/tests/unit_test/container/register/test_register_transient.py b/tests/unit_test/container/register/test_register_transient.py
@@ -1,7 +1,7 @@
 import pytest
 
-from dependency_injection.container import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestRegisterTransient(UnitTestCase):
diff --git a/tests/unit_test/container/register/test_register_with_args.py b/tests/unit_test/container/register/test_register_with_args.py
@@ -1,5 +1,5 @@
-from dependency_injection.container import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestRegisterWithArgs(UnitTestCase):
diff --git a/tests/unit_test/container/resolve/test_deprecations.py b/tests/unit_test/container/resolve/test_deprecations.py
@@ -1,9 +1,7 @@
-import warnings
-
 import pytest
-
-from dependency_injection.container import DependencyContainer
+import warnings
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestResolveDeprecations(UnitTestCase):
diff --git a/tests/unit_test/container/resolve/test_resolve_all.py b/tests/unit_test/container/resolve/test_resolve_all.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/resolve/test_resolve_factory.py b/tests/unit_test/container/resolve/test_resolve_factory.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/resolve/test_resolve_instance.py b/tests/unit_test/container/resolve/test_resolve_instance.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/resolve/test_resolve_missing_dependency.py b/tests/unit_test/container/resolve/test_resolve_missing_dependency.py
@@ -1,5 +1,6 @@
 import pytest
-from dependency_injection.container import DependencyContainer
+
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/resolve/test_resolve_scoped.py b/tests/unit_test/container/resolve/test_resolve_scoped.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/resolve/test_resolve_singleton.py b/tests/unit_test/container/resolve/test_resolve_singleton.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/resolve/test_resolve_transient.py b/tests/unit_test/container/resolve/test_resolve_transient.py
@@ -1,4 +1,4 @@
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/container/resolve/test_resolve_with_alias.py b/tests/unit_test/container/resolve/test_resolve_with_alias.py
@@ -1,10 +1,9 @@
-from dependency_injection.container import DependencyContainer
-
 from unit_test.unit_test_case import UnitTestCase
-
 from unit_test.container.resolve.test_data.vehicle import Vehicle
 from unit_test.container.resolve.test_data.vehicle import Vehicle as VehicleAlias
 
+from dependency_injection import DependencyContainer
+
 
 class TestResolveWithAlias(UnitTestCase):
     def test_register_with_alias_and_resolve_with_original_name(
diff --git a/tests/unit_test/container/resolve/test_resolve_with_args.py b/tests/unit_test/container/resolve/test_resolve_with_args.py
@@ -1,9 +1,8 @@
-from typing import Optional
-
 import pytest
 
-from dependency_injection.container import DependencyContainer
+from typing import Optional
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestResolveWithArgs(UnitTestCase):
diff --git a/tests/unit_test/container/resolve/test_resolve_with_default_values.py b/tests/unit_test/container/resolve/test_resolve_with_default_values.py
@@ -1,6 +1,6 @@
 from typing import Optional
-from dependency_injection.container import DependencyContainer
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer
 
 
 class TestResolveWithDefaultValues(UnitTestCase):
diff --git a/tests/unit_test/container/resolve/test_resolve_with_injection.py b/tests/unit_test/container/resolve/test_resolve_with_injection.py
@@ -1,12 +1,10 @@
-from dataclasses import dataclass
 from typing import List
+from dataclasses import dataclass
 
-from dependency_injection.container import DependencyContainer
-from dependency_injection.tags.all_tagged import AllTagged
-from dependency_injection.tags.any_tagged import AnyTagged
-from dependency_injection.tags.tagged import Tagged
 from unit_test.unit_test_case import UnitTestCase
 
+from dependency_injection import DependencyContainer, AllTagged, AnyTagged, Tagged
+
 
 class TestResolveWithInjection(UnitTestCase):
     def test_resolve_injects_dependencies_in_constructor(
diff --git a/tests/unit_test/container/resolve/test_resolve_with_optionals.py b/tests/unit_test/container/resolve/test_resolve_with_optionals.py
@@ -1,9 +1,6 @@
 from typing import List, Optional
-from dependency_injection.container import DependencyContainer
-from dependency_injection.tags.all_tagged import AllTagged
-from dependency_injection.tags.any_tagged import AnyTagged
-from dependency_injection.tags.tagged import Tagged
 from unit_test.unit_test_case import UnitTestCase
+from dependency_injection import DependencyContainer, AllTagged, AnyTagged, Tagged
 
 
 class TestResolveWithOptionals(UnitTestCase):
diff --git a/tests/unit_test/decorator/test_decorator.py b/tests/unit_test/decorator/test_decorator.py
@@ -1,7 +1,6 @@
 import pytest
 
-from dependency_injection.container import DependencyContainer
-from dependency_injection.decorator import inject
+from dependency_injection import DependencyContainer, inject
 from unit_test.unit_test_case import UnitTestCase
 
 
diff --git a/tests/unit_test/test_case.py b/tests/unit_test/test_case.py
@@ -1,6 +1,6 @@
 from unittest import TestCase as TestCaseBase
 
-from dependency_injection.container import DependencyContainer
+from dependency_injection import DependencyContainer
 
 
 class TestCase(TestCaseBase):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from dependency_injection.container import DependencyContainer`
	`1`	`+from dependency_injection import DependencyContainer`
`2`	`2`
`3`	`3`
`4`	`4`	`class Foo:`