bump pytest-asyncio and pytest, use ruff for formatting too, fix ordering of ormar in files (#1561)

* bump pytest-asyncio and pytest, use ruff for formatting too, fix ordering of ormar in files

* add pytest options to fix coverage on python 3.10

* switch coverage to using greenlet to fix coverage on python 3.10

Author: collerek

.coveragerc

@@ -2,6 +2,7 @@
 source = ormar, tests
 omit = ./tests/test.db, *py.typed*
 data_file = .coverage
+concurrency = greenlet
 
 [report]
 omit = ./tests/test.db, *py.typed*

Makefile

@@ -31,6 +31,6 @@ lint:
 	poetry run python -m ruff check . --fix
 
 fmt:
-	poetry run python -m black .
+	poetry run python -m ruff format .
 
 pre-commit: fmt lint type_check

benchmarks/conftest.py

@@ -4,12 +4,13 @@
 import time
 
 import nest_asyncio
-import ormar
 import pytest
 import pytest_asyncio
 from tests.lifespan import init_tests
 from tests.settings import create_config
 
+import ormar
+
 base_ormar_config = create_config()
 nest_asyncio.apply()
 pytestmark = pytest.mark.asyncio

docs/contributing.md

@@ -37,9 +37,10 @@ git checkout -b my-new-feature-branch
 # make your changes...
 
 # 4. Formatting and linting
-# ormar uses black for formatting, flake8 for linting and mypy for type hints check
+# ormar uses ruff for formatting and linting and mypy for type hints check
 # run all of the following as all those calls will be run on travis after every push
-black ormar tests
+ruff format ormar tests
+ruff check ormar tests
 flake8 ormar
 mypy ormar tests
 

docs/models/index.md

@@ -9,7 +9,7 @@ They are being managed in the background and you do not have to create them on y
 
 To build an ormar model you simply need to inherit a `ormar.Model` class.
 
-```Python hl_lines="9"
+```Python hl_lines="10"
 --8<-- "../docs_src/models/docs001.py"
 ```
 
@@ -23,7 +23,7 @@ Each table **has to** have a primary key column, which you specify by setting `p
 
 Only one primary key column is allowed.
 
-```Python hl_lines="15-17"
+```Python hl_lines="16-18"
 --8<-- "../docs_src/models/docs001.py"
 ```
 
@@ -60,7 +60,7 @@ you should get back exactly same value in `response`.).
 !!!warning
     pydantic fields have to be always **Optional** and it cannot be changed (otherwise db load validation would fail)
 
-```Python hl_lines="19"
+```Python hl_lines="20"
 --8<-- "../docs_src/models/docs014.py"
 ```
 
@@ -139,7 +139,7 @@ If for whatever reason you prefer to change the name in the database but keep th
 with specifying `name` parameter during Field declaration
 
 Here you have a sample model with changed names
-```Python hl_lines="18-21"
+```Python hl_lines="19-22"
 --8<-- "../docs_src/models/docs008.py"
 ```
 
@@ -149,7 +149,7 @@ Note that you can also change the ForeignKey column name
 ```
 
 But for now you cannot change the ManyToMany column names as they go through other Model anyway.
-```Python hl_lines="43"
+```Python hl_lines="44"
 --8<-- "../docs_src/models/docs010.py"
 ```
 
@@ -193,13 +193,13 @@ book = await Book.objects.first_or_404(name="123")
 
 Note that for better IDE support and mypy checks you can provide type hints.
 
-```Python hl_lines="15-17"
+```Python hl_lines="16-18"
 --8<-- "../docs_src/models/docs001.py"
 ```
 
 Note that type hints are **optional** so perfectly valid `ormar` code can look like this:
 
-```Python hl_lines="15-17"
+```Python hl_lines="16-18"
 --8<-- "../docs_src/models/docs012.py"
 ```
 
@@ -222,7 +222,7 @@ One is `DatabaseConnection` instance created with your database url in [sqlalche
 
 Created instance needs to be passed to every `Model` with `ormar_config` object `database` parameter.
 
-```Python hl_lines="3 5 11"
+```Python hl_lines="4 6 12"
 --8<-- "../docs_src/models/docs001.py"
 ```
 
@@ -236,7 +236,7 @@ Second dependency is sqlalchemy `MetaData` instance.
 
 Created instance needs to be passed to every `Model` with `ormar_config` object `metadata` parameter.
 
-```Python hl_lines="2 6 12"
+```Python hl_lines="1 7 13"
 --8<-- "../docs_src/models/docs001.py"
 ```
 
@@ -251,7 +251,7 @@ To ease the config management, the `OrmarConfig` class provide `copy` method.
 So instead of providing the same parameters over and over again for all models
 you should create a base object and use its copy in all models.
 
-```Python hl_lines="9-12 19 28"
+```Python hl_lines="10-13 20 29"
 --8<-- "../docs_src/models/docs013.py"
 ```
 
@@ -281,7 +281,7 @@ Right now only `IndexColumns`, `UniqueColumns` and `CheckColumns` constraints ar
 
 You can set this parameter by providing `ormar_config` object `constraints` argument.
 
-```Python hl_lines="13-16"
+```Python hl_lines="14-17"
 --8<-- "../docs_src/models/docs006.py"
 ```
 
@@ -294,7 +294,7 @@ You can set this parameter by providing `ormar_config` object `constraints` argu
 
 You can set this parameter by providing `ormar_config` object `constraints` argument.
 
-```Python hl_lines="13-16"
+```Python hl_lines="14-17"
 --8<-- "../docs_src/models/docs017.py"
 ```
 
@@ -307,7 +307,7 @@ You can set this parameter by providing `ormar_config` object `constraints` argu
 
 You can set this parameter by providing `ormar_config` object `constraints` argument.
 
-```Python hl_lines="15-20"
+```Python hl_lines="16-21"
 --8<-- "../docs_src/models/docs018.py"
 ```
 
@@ -334,7 +334,7 @@ model_config = ConfigDict(validate_assignment=True, ser_json_bytes="base64")
 ```
 
 So to overwrite setting or provide your own a sample model can look like following:
-```Python hl_lines="16"
+```Python hl_lines="17"
 --8<-- "../docs_src/models/docs016.py"
 ```
 
@@ -415,7 +415,7 @@ There are two ways to create and persist the `Model` instance in the database.
 
 If you plan to modify the instance in the later execution of your program you can initiate your `Model` as a normal class and later await a `save()` call.  
 
-```Python hl_lines="29-30"
+```Python hl_lines="30-31"
 --8<-- "../docs_src/models/docs007.py"
 ```
 
@@ -425,7 +425,7 @@ For creating multiple objects at once a `bulk_create()` QuerySet's method is ava
 
 Each model has a `QuerySet` initialised as `objects` parameter 
 
-```Python hl_lines="32"
+```Python hl_lines="33"
 --8<-- "../docs_src/models/docs007.py"
 ```
 

docs/models/internals.md

@@ -8,7 +8,7 @@ All `Model` classes inherit from `pydantic.BaseModel` so you can access all norm
 
 For example to list pydantic model fields you can:
 
-```Python hl_lines="20"
+```Python hl_lines="21"
 --8<-- "../docs_src/models/docs003.py"
 ```
 
@@ -24,7 +24,7 @@ To access auto created sqlalchemy table you can use `Model.ormar_config.table` p
 
 For example to list table columns you can:
 
-```Python hl_lines="24"
+```Python hl_lines="25"
 --8<-- "../docs_src/models/docs004.py"
 ```
 
@@ -40,7 +40,7 @@ To access ormar `Fields` you can use `Model.ormar_config.model_fields` parameter
 
 For example to list table model fields you can:
 
-```Python hl_lines="22"
+```Python hl_lines="23"
 --8<-- "../docs_src/models/docs005.py"
 ```
 

docs/mypy.md

@@ -2,15 +2,15 @@ To provide better errors check you should use mypy with pydantic [plugin][plugin
 
 Please use notation introduced in version 0.4.0.
 
-```Python hl_lines="15-17"
+```Python hl_lines="16-18"
 --8<-- "../docs_src/models/docs012.py"
 ```
 
 Note that above example is not using the type hints, so further operations with mypy might fail, depending on the context.
 
 Preferred notation should look liked this:
 
-```Python hl_lines="15-17"
+```Python hl_lines="16-18"
 --8<-- "../docs_src/models/docs001.py"
 ```
 

docs/queries/create.md

@@ -109,7 +109,7 @@ assert album == album2
 
 Updates the model, or in case there is no match in database creates a new one.
 
-```Python hl_lines="43-51"
+```Python hl_lines="44-52"
 --8<-- "../docs_src/queries/docs003.py"
 ```
 
@@ -125,7 +125,7 @@ Allows you to create multiple objects at once.
 
 A valid list of `Model` objects needs to be passed.
 
-```python hl_lines="29-35"
+```python hl_lines="30-37"
 --8<-- "../docs_src/queries/docs004.py"
 ```
 

docs/queries/delete.md

@@ -26,7 +26,7 @@ If you do not provide this flag or a filter a `QueryDefinitionError` will be rai
 
 Return number of rows deleted.
 
-```python hl_lines="43-47"
+```python hl_lines="44-48"
 --8<-- "../docs_src/queries/docs005.py"
 ```
 

docs/queries/update.md

@@ -29,7 +29,7 @@ If you do not provide this flag or a filter a `QueryDefinitionError` will be rai
 
 Return number of rows updated.
 
-```Python hl_lines="45-47"
+```Python hl_lines="46-48"
 --8<-- "../docs_src/queries/docs002.py"
 ```
 
@@ -44,7 +44,7 @@ Return number of rows updated.
 
 Updates the model, or in case there is no match in database creates a new one.
 
-```Python hl_lines="43-51"
+```Python hl_lines="44-52"
 --8<-- "../docs_src/queries/docs003.py"
 ```