Don't import maven classes from maven.core

They are part of the jgo.maven toplevel API; core is more internal.

Author: ctrueden

src/jgo/cli/output.py

@@ -24,8 +24,7 @@
 
 if TYPE_CHECKING:
     from ..env import Environment
-    from ..maven import MavenContext
-    from ..maven.core import Dependency
+    from ..maven import Dependency, MavenContext
     from .args import ParsedArgs
 
 

src/jgo/cli/rich/formatters.py

@@ -15,7 +15,7 @@
 from .widgets import NoWrapTree
 
 if TYPE_CHECKING:
-    from ...maven.core import DependencyNode
+    from ...maven import DependencyNode
     from ...parse.coordinate import Coordinate
 
 

src/jgo/env/builder.py

@@ -13,7 +13,7 @@
 
 from ..constants import default_jgo_cache
 from ..exec.java_source import JavaLocator, JavaSource
-from ..maven.core import Dependency
+from ..maven import Dependency
 from ..parse.coordinate import Coordinate
 from ..parse.endpoint import Endpoint
 from .bytecode import detect_jar_java_version

tests/cli/color.t.err

@@ -1,7 +1,7 @@
 """Test that cache key includes classifier and packaging."""
 
 from jgo.env.builder import EnvironmentBuilder
-from jgo.maven.core import MavenContext
+from jgo.maven import MavenContext
 from jgo.parse.coordinate import Coordinate
 
 

tests/cli/help.t.err

@@ -88,7 +88,7 @@ def test_cache_key_generation():
         builder = EnvironmentBuilder(context=maven, cache_dir=cache_dir)
 
         # Create some test dependencies
-        from jgo.maven.core import Dependency
+        from jgo.maven import Dependency
 
         project1 = maven.project("org.example", "artifact1")
         component1 = project1.at_version("1.0.0")

tests/test_cache_key.py

@@ -13,9 +13,7 @@
 import pytest
 
 from jgo.env import EnvironmentBuilder
-from jgo.maven import MavenContext
-from jgo.maven.core import Component, Dependency
-from jgo.maven.resolver import MvnResolver, PythonResolver
+from jgo.maven import Component, Dependency, MavenContext, MvnResolver, PythonResolver
 from jgo.parse.endpoint import Endpoint
 from jgo.util.maven import ensure_maven_available
 

tests/test_env.py

@@ -308,7 +308,7 @@ def test_python_resolver_managed(self, thicket_pom, thicket_context):
         version = thicket_pom_obj.version
 
         # Create component and wrap in Dependency
-        from jgo.maven.core import Dependency
+        from jgo.maven import Dependency
 
         component = thicket_context.project(
             "org.scijava.jgo.thicket", "thicket"
@@ -348,7 +348,7 @@ def test_python_resolver_unmanaged(self, thicket_pom, thicket_context):
         version = thicket_pom_obj.version
 
         # Create component and wrap in Dependency (raw=True for unmanaged)
-        from jgo.maven.core import Dependency
+        from jgo.maven import Dependency
 
         component = thicket_context.project(
             "org.scijava.jgo.thicket", "thicket"