Merge branch 'master' into json_field

Author: dantownsend

docs/src/conf.py

@@ -27,7 +27,7 @@
 copyright = f"{year}, {author}"
 
 
-import piccolo  # noqa
+import piccolo  # noqa: E402
 
 version = ".".join(piccolo.__VERSION__.split(".")[:2])
 release = piccolo.__VERSION__

piccolo/query/methods/__init__.py

@@ -1,13 +1,13 @@
-from .alter import Alter  # noqa
-from .count import Count  # noqa
-from .create import Create  # noqa
-from .create_index import CreateIndex  # noqa
-from .delete import Delete  # noqa
-from .drop_index import DropIndex  # noqa
-from .exists import Exists  # noqa
-from .insert import Insert  # noqa
-from .objects import Objects  # noqa
-from .raw import Raw  # noqa
-from .select import Select  # noqa
-from .table_exists import TableExists  # noqa
-from .update import Update  # noqa
+from .alter import Alter  # noqa: F401: F401
+from .count import Count  # noqa: F401
+from .create import Create  # noqa: F401
+from .create_index import CreateIndex  # noqa: F401
+from .delete import Delete  # noqa: F401
+from .drop_index import DropIndex  # noqa: F401
+from .exists import Exists  # noqa: F401
+from .insert import Insert  # noqa: F401
+from .objects import Objects  # noqa: F401
+from .raw import Raw  # noqa: F401
+from .select import Select  # noqa: F401
+from .table_exists import TableExists  # noqa: F401
+from .update import Update  # noqa: F401

piccolo/querystring.py

@@ -81,7 +81,7 @@ def __str__(self):
     def bundle(
         self,
         start_index: int = 1,
-        bundled: t.Optional[t.List] = None,
+        bundled: t.Optional[t.List[Fragment]] = None,
         combined_args: t.Optional[t.List] = None,
     ):
         # Split up the string, separating by {}.

tests/apps/user/commands/test_create.py

@@ -37,9 +37,9 @@ def test_create(self, *args, **kwargs):
         self.assertTrue(
             BaseUser.exists()
             .where(
-                (BaseUser.admin == True)
+                (BaseUser.admin == True)  # noqa: E712
                 & (BaseUser.username == "bob123")
-                & (BaseUser.email == "[email protected]")  # noqa
+                & (BaseUser.email == "[email protected]")
             )
             .run_sync()
         )