fix: circular import

Charles Lariviere · Charles Lariviere · commit eba28bfa25df · 2022-02-24T20:26:18.000-05:00
Signed-off-by: Charles Lariviere &lt;charles@dribbble.com&gt;
diff --git a/src/metabase/resource.py b/src/metabase/resource.py
@@ -2,8 +2,8 @@
 
 from requests import HTTPError
 
-from metabase import Metabase
 from metabase.exceptions import NotFoundError
+from metabase.metabase import Metabase
 from metabase.missing import MISSING
 
 
diff --git a/tests/helpers.py b/tests/helpers.py
@@ -2,7 +2,7 @@
 
 import requests
 
-from metabase import Metabase
+from metabase.metabase import Metabase
 
 
 class IntegrationTestCase(TestCase):
diff --git a/tests/mbql/test_query.py b/tests/mbql/test_query.py
@@ -4,6 +4,7 @@
 from metabase.mbql.filter import Equal
 from metabase.mbql.groupby import GroupBy
 from metabase.mbql.query import Query
+from metabase.resources.metric import Metric
 
 
 class QueryTests(TestCase):
diff --git a/tests/resources/test_card.py b/tests/resources/test_card.py
@@ -1,4 +1,4 @@
-from metabase import Card
+from metabase.resources.card import Card
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/resources/test_database.py b/tests/resources/test_database.py
@@ -1,5 +1,7 @@
-from metabase import Database, Field, Table
 from metabase.exceptions import NotFoundError
+from metabase.resources.database import Database
+from metabase.resources.field import Field
+from metabase.resources.table import Table
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/resources/test_field.py b/tests/resources/test_field.py
@@ -1,4 +1,4 @@
-from metabase import Field
+from metabase.resources.field import Field
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/resources/test_metric.py b/tests/resources/test_metric.py
@@ -1,5 +1,5 @@
-from metabase import Metric
 from metabase.exceptions import NotFoundError
+from metabase.resources.metric import Metric
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/resources/test_permission_group.py b/tests/resources/test_permission_group.py
@@ -1,5 +1,5 @@
-from metabase import PermissionGroup
 from metabase.exceptions import NotFoundError
+from metabase.resources.permission_group import PermissionGroup
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/resources/test_permission_membership.py b/tests/resources/test_permission_membership.py
@@ -1,4 +1,5 @@
-from metabase import PermissionGroup, PermissionMembership
+from metabase.resources.permission_group import PermissionGroup
+from metabase.resources.permission_membership import PermissionMembership
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/resources/test_segment.py b/tests/resources/test_segment.py
@@ -1,5 +1,5 @@
-from metabase import Segment
 from metabase.exceptions import NotFoundError
+from metabase.resources.segment import Segment
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/resources/test_table.py b/tests/resources/test_table.py
@@ -1,4 +1,5 @@
-from metabase import Field, Metric
+from metabase.resources.field import Field
+from metabase.resources.metric import Metric
 from metabase.resources.segment import Segment
 from metabase.resources.table import Dimension, Table
 from tests.helpers import IntegrationTestCase
diff --git a/tests/resources/test_user.py b/tests/resources/test_user.py
@@ -1,7 +1,7 @@
 from random import randint
 
-from metabase import User
 from metabase.exceptions import NotFoundError
+from metabase.resources.user import User
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/test_metabase.py b/tests/test_metabase.py
@@ -1,7 +1,7 @@
 from unittest import TestCase
 
-from metabase import Metabase
 from metabase.exceptions import AuthenticationError
+from metabase.metabase import Metabase
 from tests.helpers import IntegrationTestCase
 
 
diff --git a/tests/test_resource.py b/tests/test_resource.py
@@ -3,6 +3,7 @@
 from requests import HTTPError
 
 from metabase.exceptions import NotFoundError
+from metabase.metabase import Metabase
 from metabase.missing import MISSING
 from metabase.resource import (
     CreateResource,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from metabase import Card`
	`1`	`+from metabase.resources.card import Card`
`2`	`2`	`from tests.helpers import IntegrationTestCase`
`3`	`3`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from metabase import Field`
	`1`	`+from metabase.resources.field import Field`
`2`	`2`	`from tests.helpers import IntegrationTestCase`
`3`	`3`
`4`	`4`