Merge branch 'hotfix/0.1.1' into main

.gitignore

@@ -141,4 +141,4 @@ cython_debug/
 
 
 .idea/
-/metabase/_version.py
+/src/metabase/_version.py

setup.py

@@ -10,7 +10,7 @@
     name="metabase-python",
     use_scm_version={
         "local_scheme": "dirty-tag",
-        "write_to": "metabase/_version.py",
+        "write_to": "src/metabase/_version.py",
         "fallback_version": "0.0.0",
     },
     description="A Python wrapper for interacting with Metabase's API.",
@@ -19,9 +19,8 @@
     author="Charles Lariviere",
     author_email="[email protected]  ",
     url="https://github.com/chasleslr/metabase-python",
-    packages=find_packages("metabase"),
-    package_dir={"": "metabase"},
-    py_modules=[splitext(basename(path))[0] for path in glob("metabase/*.py")],
+    packages=find_packages("src"),
+    package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
     classifiers=[

metabase/resource.py → src/metabase/resource.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from exceptions import NotFoundError
 from requests import HTTPError
 
 from metabase import Metabase
+from metabase.exceptions import NotFoundError
 from metabase.missing import MISSING
 
 

tests/resources/test_database.py

@@ -1,8 +1,5 @@
-from exceptions import NotFoundError
-
-from metabase import Database
-from metabase.resources.field import Field
-from metabase.resources.table import Table
+from metabase import Database, Field, Table
+from metabase.exceptions import NotFoundError
 from tests.helpers import IntegrationTestCase
 
 

tests/resources/test_field.py

@@ -1,4 +1,4 @@
-from metabase.resources.field import Field
+from metabase import Field
 from tests.helpers import IntegrationTestCase
 
 

tests/resources/test_metric.py

@@ -1,6 +1,5 @@
-from exceptions import NotFoundError
-
-from metabase.resources.metric import Metric
+from metabase import Metric
+from metabase.exceptions import NotFoundError
 from tests.helpers import IntegrationTestCase
 
 

tests/resources/test_permission_group.py

@@ -1,6 +1,5 @@
-from exceptions import NotFoundError
-
-from metabase import PermissionGroup, PermissionMembership
+from metabase import PermissionGroup
+from metabase.exceptions import NotFoundError
 from tests.helpers import IntegrationTestCase
 
 

tests/resources/test_permission_membership.py

@@ -1,5 +1,3 @@
-from exceptions import NotFoundError
-
 from metabase import PermissionGroup, PermissionMembership
 from tests.helpers import IntegrationTestCase
 

tests/resources/test_segment.py

@@ -1,6 +1,5 @@
-from exceptions import NotFoundError
-
-from metabase.resources.segment import Segment
+from metabase import Segment
+from metabase.exceptions import NotFoundError
 from tests.helpers import IntegrationTestCase
 
 

tests/resources/test_table.py

@@ -1,7 +1,5 @@
-from resources.segment import Segment
-
-from metabase.resources.field import Field
-from metabase.resources.metric import Metric
+from metabase import Field, Metric
+from metabase.resources.segment import Segment
 from metabase.resources.table import Dimension, Table
 from tests.helpers import IntegrationTestCase
 

tests/resources/test_user.py

@@ -1,8 +1,7 @@
 from random import randint
 
-from exceptions import NotFoundError
-
-from metabase.resources.user import User
+from metabase import User
+from metabase.exceptions import NotFoundError
 from tests.helpers import IntegrationTestCase
 
 

tests/test_resource.py

@@ -1,9 +1,9 @@
 from unittest.mock import patch
 
-from exceptions import NotFoundError
 from requests import HTTPError
 
-from metabase.metabase import Metabase
+from metabase import Metabase
+from metabase.exceptions import NotFoundError
 from metabase.missing import MISSING
 from metabase.resource import (
     CreateResource,