reforat with ruff, fix jobs

collerek · Jan 25, 2024 · 87ecdbc · 87ecdbc
1 parent c5a10fb
commit 87ecdbc
Show file tree

Hide file tree

Showing 219 changed files with 1,399 additions and 1,189 deletions.
diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -28,4 +28,4 @@ jobs:
       env:
         POETRY_VIRTUALENVS_CREATE: false
     - name: Lint
-      run: make style
+      run: python -m ruff . --fix
diff --git a/.github/workflows/type-check.yml b/.github/workflows/type-check.yml
@@ -28,4 +28,4 @@ jobs:
       env:
         POETRY_VIRTUALENVS_CREATE: false
     - name: Lint
-      run: make type_check
+      run: python -m mypy . --ignore-missing-imports --install-types --non-interactive
diff --git a/Makefile b/Makefile
@@ -21,14 +21,8 @@ test:
 coverage:
 	pytest --cov=ormar --cov=tests --cov-fail-under=100 --cov-report=term-missing
 
-
-fmt:
-	poetry run python -m black --line-length=120 .
-
 type_check:
 	mkdir -p .mypy_cache && poetry run python -m mypy . --ignore-missing-imports --install-types --non-interactive
 
 lint:
-	poetry run python -m ruff . --fix
-
-style: fmt lint
+	poetry run python -m ruff . --fix
diff --git a/benchmarks/conftest.py b/benchmarks/conftest.py
@@ -5,11 +5,10 @@
 
 import databases
 import nest_asyncio
+import ormar
 import pytest
 import pytest_asyncio
 import sqlalchemy
-
-import ormar
 from tests.settings import DATABASE_URL
 
 nest_asyncio.apply()
@@ -25,6 +24,7 @@
     database=database,
 )
 
+
 class Author(ormar.Model):
     class Meta(BaseMeta):
         tablename = "authors"

diff --git a/docs_src/aggregations/docs001.py b/docs_src/aggregations/docs001.py
@@ -1,9 +1,8 @@
 from typing import Optional
 
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 from tests.settings import DATABASE_URL
 
 database = databases.Database(DATABASE_URL)
@@ -15,6 +14,7 @@
     database=database,
 )
 
+
 class Author(ormar.Model):
     class Meta(BaseMeta):
         tablename = "authors"

diff --git a/docs_src/fastapi/docs001.py b/docs_src/fastapi/docs001.py
@@ -1,11 +1,10 @@
 from typing import List, Optional
 
 import databases
+import ormar
 import sqlalchemy
 from fastapi import FastAPI
 
-import ormar
-
 app = FastAPI()
 metadata = sqlalchemy.MetaData()
 database = databases.Database("sqlite:///test.db")

diff --git a/docs_src/fastapi/mypy/docs001.py b/docs_src/fastapi/mypy/docs001.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/fields/docs001.py b/docs_src/fields/docs001.py
@@ -1,9 +1,8 @@
 from typing import Optional
 
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/fields/docs002.py b/docs_src/fields/docs002.py
@@ -1,9 +1,8 @@
 from typing import Optional
 
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()
@@ -26,7 +25,9 @@ class Meta:
     id: int = ormar.Integer(primary_key=True)
     name: str = ormar.String(max_length=100)
     completed: bool = ormar.Boolean(default=False)
-    department: Optional[Department] = ormar.ForeignKey(Department, related_name="my_courses")
+    department: Optional[Department] = ormar.ForeignKey(
+        Department, related_name="my_courses"
+    )
 
 
 department = Department(name="Science")

diff --git a/docs_src/fields/docs003.py b/docs_src/fields/docs003.py
@@ -1,9 +1,8 @@
 from typing import Optional
 
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/fields/docs004.py b/docs_src/fields/docs004.py
@@ -1,11 +1,10 @@
 from datetime import datetime
 
 import databases
+import ormar
 import sqlalchemy
 from sqlalchemy import func, text
 
-import ormar
-
 database = databases.Database("sqlite:///test.db")
 metadata = sqlalchemy.MetaData()
 

diff --git a/docs_src/models/docs001.py b/docs_src/models/docs001.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs002.py b/docs_src/models/docs002.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs003.py b/docs_src/models/docs003.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs004.py b/docs_src/models/docs004.py
@@ -1,14 +1,15 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()
 
 
 class Course(ormar.Model):
-    class Meta(ormar.ModelMeta):  # note you don't have to subclass - but it's recommended for ide completion and mypy
+    class Meta(
+        ormar.ModelMeta
+    ):  # note you don't have to subclass - but it's recommended for ide completion and mypy
         database = database
         metadata = metadata
 

diff --git a/docs_src/models/docs005.py b/docs_src/models/docs005.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs006.py b/docs_src/models/docs006.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs007.py b/docs_src/models/docs007.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs008.py b/docs_src/models/docs008.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///test.db", force_rollback=True)
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs009.py b/docs_src/models/docs009.py
@@ -1,9 +1,9 @@
 from typing import Optional
 
 import databases
+import ormar
 import sqlalchemy
 
-import ormar
 from .docs010 import Artist  # previous example
 
 database = databases.Database("sqlite:///test.db", force_rollback=True)

diff --git a/docs_src/models/docs010.py b/docs_src/models/docs010.py
@@ -1,7 +1,7 @@
 import databases
+import ormar
 import sqlalchemy
 
-import ormar
 from .docs008 import Child
 
 database = databases.Database("sqlite:///test.db", force_rollback=True)

diff --git a/docs_src/models/docs011.py b/docs_src/models/docs011.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()
@@ -16,4 +15,5 @@ class Meta:
     name: ormar.String(max_length=100)
     completed: ormar.Boolean(default=False)
 
-c1 = Course()
+
+c1 = Course()
diff --git a/docs_src/models/docs012.py b/docs_src/models/docs012.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs013.py b/docs_src/models/docs013.py
@@ -1,9 +1,8 @@
 from typing import Optional
 
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///test.db", force_rollback=True)
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs014.py b/docs_src/models/docs014.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs015.py b/docs_src/models/docs015.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 from ormar import property_field
 
 database = databases.Database("sqlite:///db.sqlite")

diff --git a/docs_src/models/docs016.py b/docs_src/models/docs016.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs017.py b/docs_src/models/docs017.py
@@ -1,7 +1,6 @@
 import databases
-import sqlalchemy
-
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/models/docs018.py b/docs_src/models/docs018.py
@@ -1,8 +1,8 @@
 import datetime
-import databases
-import sqlalchemy
 
+import databases
 import ormar
+import sqlalchemy
 
 database = databases.Database("sqlite:///db.sqlite")
 metadata = sqlalchemy.MetaData()

diff --git a/docs_src/queries/docs002.py b/docs_src/queries/docs002.py
@@ -15,14 +15,17 @@ class Meta:
     id: int = ormar.Integer(primary_key=True)
     title: str = ormar.String(max_length=200)
     author: str = ormar.String(max_length=100)
-    genre: str = ormar.String(max_length=100, default='Fiction',
-                              choices=['Fiction', 'Adventure', 'Historic', 'Fantasy'])
+    genre: str = ormar.String(
+        max_length=100,
+        default="Fiction",
+        choices=["Fiction", "Adventure", "Historic", "Fantasy"],
+    )
 
 
-await Book.objects.create(title='Tom Sawyer', author="Twain, Mark", genre='Adventure')
-await Book.objects.create(title='War and Peace', author="Tolstoy, Leo", genre='Fiction')
-await Book.objects.create(title='Anna Karenina', author="Tolstoy, Leo", genre='Fiction')
+await Book.objects.create(title="Tom Sawyer", author="Twain, Mark", genre="Adventure")
+await Book.objects.create(title="War and Peace", author="Tolstoy, Leo", genre="Fiction")
+await Book.objects.create(title="Anna Karenina", author="Tolstoy, Leo", genre="Fiction")
 
-await Book.objects.update(each=True, genre='Fiction')
-all_books = await Book.objects.filter(genre='Fiction').all()
+await Book.objects.update(each=True, genre="Fiction")
+all_books = await Book.objects.filter(genre="Fiction").all()
 assert len(all_books) == 3
diff --git a/docs_src/queries/docs003.py b/docs_src/queries/docs003.py
@@ -15,18 +15,23 @@ class Meta:
     id: int = ormar.Integer(primary_key=True)
     title: str = ormar.String(max_length=200)
     author: str = ormar.String(max_length=100)
-    genre: str = ormar.String(max_length=100, default='Fiction',
-                              choices=['Fiction', 'Adventure', 'Historic', 'Fantasy'])
+    genre: str = ormar.String(
+        max_length=100,
+        default="Fiction",
+        choices=["Fiction", "Adventure", "Historic", "Fantasy"],
+    )
 
 
-await Book.objects.create(title='Tom Sawyer', author="Twain, Mark", genre='Adventure')
-await Book.objects.create(title='War and Peace', author="Tolstoy, Leo", genre='Fiction')
-await Book.objects.create(title='Anna Karenina', author="Tolstoy, Leo", genre='Fiction')
+await Book.objects.create(title="Tom Sawyer", author="Twain, Mark", genre="Adventure")
+await Book.objects.create(title="War and Peace", author="Tolstoy, Leo", genre="Fiction")
+await Book.objects.create(title="Anna Karenina", author="Tolstoy, Leo", genre="Fiction")
 
 # if not exist the instance will be persisted in db
-vol2 = await Book.objects.update_or_create(title="Volume II", author='Anonymous', genre='Fiction')
+vol2 = await Book.objects.update_or_create(
+    title="Volume II", author="Anonymous", genre="Fiction"
+)
 assert await Book.objects.count() == 1
 
 # if pk or pkname passed in kwargs (like id here) the object will be updated
-assert await Book.objects.update_or_create(id=vol2.id, genre='Historic')
+assert await Book.objects.update_or_create(id=vol2.id, genre="Historic")
 assert await Book.objects.count() == 1