Fixed tests

Makefile

@@ -23,7 +23,7 @@ test:
 ## lint: Lint and format
 lint:
 	flake8 .
-	black --check .
+	black --diff .
 
 ## docs: Generate docs locally
 docs:

airtable/api/api.py

@@ -92,7 +92,6 @@
 
 from typing import List
 import requests
-from collections import OrderedDict
 from functools import lru_cache
 import posixpath
 import time

airtable/orm/__init__.py

@@ -1,5 +1,5 @@
 from airtable import Table
-from typing import TypeVar, Type, Generic, Optional, Tuple
+from typing import TypeVar, Type, Optional, Tuple
 
 from .fields import Field
 

airtable/orm/fields.py

@@ -1,4 +1,3 @@
-import abc
 from typing import Any, TypeVar, Type, Generic, Optional, TYPE_CHECKING
 
 if TYPE_CHECKING:

setup.py

@@ -18,7 +18,7 @@
     author_email=about["__authoremail__"],
     url=about["__url__"],
     version=about["__version__"],
-    packages=["airtable"],
+    packages=["airtable", "airtable.api", "airtable.orm"],
     setup_requires=setup_requires,
     install_requires=install_requires,
     tests_require=tests_require,

tests/conftest.py

@@ -1,13 +1,12 @@
-from airtable.api.api import AirtableApi
 import pytest
-from collections import OrderedDict
-from posixpath import join as urljoin
 
+from posixpath import join as urljoin
 from requests import HTTPError
 from urllib.parse import urlencode, quote
 from mock import Mock
 
 from airtable.api import AirtableApi, Table
+from collections import OrderedDict
 
 
 @pytest.fixture

tests/integration.py

@@ -1,5 +1,8 @@
 import os
 from airtable import Base, Table
+from airtable.orm import Model
+from airtable.orm import fields as f
+from airtable.formulas import AND, EQUAL, FIELD, STR_VALUE
 
 base_id = "appaPqizdsNHDvlEm"
 table_name = "table"
@@ -63,10 +66,6 @@
 assert len(records) == 15
 
 
-from airtable.orm import Model
-from airtable.orm import fields as f
-
-
 class Address(Model):
     street = f.TextField("Street")
     number = f.TextField("Number")
@@ -116,9 +115,6 @@ class Meta:
 print(address.to_record())
 
 
-from airtable.formulas import AND, EQUAL, FIELD, STR_VALUE
-
-
 table = Table(base_id, "Contact", os.environ["AIRTABLE_API_KEY"])
 
 # formula = EQUAL("{First Name}", "'A'")

tests/test_api_table.py

@@ -2,7 +2,6 @@
 from posixpath import join as urljoin
 from requests import Request
 from requests_mock import Mocker
-from urllib.parse import urlencode
 
 from airtable import Table
 

tests/test_params.py

@@ -2,7 +2,6 @@
 import requests
 from requests_mock import Mocker
 
-from airtable.api import Table
 from airtable.api.params import (
     to_params_dict,
     dict_list_to_request_params,

tox.ini

@@ -25,4 +25,4 @@ commands = pytest
 python = python3.7
 commands =
     black --diff airtable tests
-    flake8
+    flake8 .