refactor: applied ruff to sources; updated Makefile

Author: Michael Kryukov

Makefile

@@ -1,10 +1,14 @@
 .PHONY: all
 
-all: lint test
+all: check test
 
-lint:
-	flake8 mongomock_motor/ tests/ --count --select=E9,F63,F7,F82 --show-source --statistics
-	flake8 mongomock_motor/ tests/ --count --max-complexity=10 --max-line-length=127 --statistics
+check:
+	python3 -m ruff check mongomock_motor/ tests/ && \
+	python3 -m ruff format --check mongomock_motor/ tests/
+
+format:
+	python3 -m ruff check --fix mongomock_motor/ tests/ && \
+	python3 -m ruff format mongomock_motor/ tests/
 
 test:
 	ENVIRONMENT=test python3 -m pytest tests/

ruff.toml

@@ -1,4 +1,7 @@
 target-version = "py38"
 
+[lint]
+select = ["E4", "E7", "E9", "F", "I"]
+
 [format]
 quote-style = "single"

tests/test_async_cursor.py

@@ -1,7 +1,7 @@
 import pymongo
 import pytest
-from mongomock_motor import AsyncMongoMockClient
 
+from mongomock_motor import AsyncMongoMockClient
 
 EXPECTED_DOCUMENTS_COUNT = 10
 
@@ -31,8 +31,7 @@ async def test_skip_and_limit():
 
     # Query with limit, skip and sort
     docs = await (
-        collection
-        .find(projection={'_id': 0})
+        collection.find(projection={'_id': 0})
         .skip(2)
         .limit(2)
         .sort('i', pymongo.DESCENDING)

tests/test_attrs.py

@@ -1,5 +1,6 @@
-from pymongo import ReadPreference
 import pytest
+from pymongo import ReadPreference
+
 from mongomock_motor import AsyncMongoMockClient
 
 
@@ -10,7 +11,9 @@ async def test_attrs():
     collection = database.get_collection('test')
     await collection.insert_one({'a': 1})
 
-    assert await client['tests']['test'].find_one(projection={'_id': 0, 'a': 1}) == {'a': 1}
+    assert await client['tests']['test'].find_one(projection={'_id': 0, 'a': 1}) == {
+        'a': 1
+    }
     assert await client.tests.test.find_one(projection={'_id': 0, 'a': 1}) == {'a': 1}
     assert await collection.find_one(projection={'_id': 0, 'a': 1}) == {'a': 1}
 

tests/test_beanie.py

@@ -1,7 +1,9 @@
 from typing import Optional
-from beanie import Document, Link, WriteRules, Indexed, init_beanie
-from pydantic import BaseModel
+
 import pytest
+from beanie import Document, Indexed, Link, WriteRules, init_beanie
+from pydantic import BaseModel
+
 from mongomock_motor import AsyncMongoMockClient
 
 
@@ -19,11 +21,15 @@ class Product(Document):
 
 @pytest.mark.anyio
 async def test_beanie():
-    client = AsyncMongoMockClient('mongodb://user:pass@host:27017', connectTimeoutMS=250)
+    client = AsyncMongoMockClient(
+        'mongodb://user:pass@host:27017', connectTimeoutMS=250
+    )
 
     await init_beanie(database=client.beanie_test, document_models=[Product])
 
-    chocolate = Category(name='Chocolate', description='A preparation of roasted and ground cacao seeds.')
+    chocolate = Category(
+        name='Chocolate', description='A preparation of roasted and ground cacao seeds.'
+    )
 
     tonybar = Product(name="Tony's", price=5.95, category=chocolate)
     await tonybar.insert()
@@ -55,7 +61,9 @@ class House(Document):
 
 @pytest.mark.anyio
 async def test_beanie_links():
-    client = AsyncMongoMockClient('mongodb://user:pass@host:27017', connectTimeoutMS=250)
+    client = AsyncMongoMockClient(
+        'mongodb://user:pass@host:27017', connectTimeoutMS=250
+    )
 
     await init_beanie(database=client.beanie_test, document_models=[Door, House])
 

tests/test_hashable.py

@@ -12,13 +12,13 @@ async def test_hashing_is_possible():
 
 @pytest.mark.anyio
 async def test_hashing_is_stable():
-    assert hash(AsyncMongoMockClient()) == hash(AsyncMongoMockClient())
-    assert hash(AsyncMongoMockClient('localhost')) == hash(
-        AsyncMongoMockClient('not.localhost')
-    )
-    assert hash(AsyncMongoMockClient()['database1']) == hash(
-        AsyncMongoMockClient()['database1']
-    )
-    assert hash(AsyncMongoMockClient()['database1']) != hash(
-        AsyncMongoMockClient()['database2']
-    )
+    client1 = AsyncMongoMockClient()
+    client2 = AsyncMongoMockClient()
+    client3 = AsyncMongoMockClient('not.localhost')
+
+    assert hash(client1) == hash(client2)
+    assert hash(client1) != hash(client3)
+    assert hash(client2) != hash(client3)
+
+    assert hash(client1['database1']) == hash(client2['database1'])
+    assert hash(client1['database1']) != hash(client2['database2'])

tests/test_list_names.py

@@ -1,4 +1,5 @@
 import pytest
+
 from mongomock_motor import AsyncMongoMockClient
 
 

tests/test_mocking.py

@@ -1,7 +1,9 @@
 from unittest.mock import patch
+
+import pytest
 from bson import ObjectId
 from pymongo.results import UpdateResult
-import pytest
+
 from mongomock_motor import AsyncMongoMockClient
 
 
@@ -20,14 +22,18 @@ async def sample_function(collection):
 def async_wrapper(value):
     async def wrapper(*args, **kwargs):
         return value
+
     return wrapper
 
 
 @pytest.mark.anyio
 async def test_patch():
     collection = AsyncMongoMockClient()['test']['test']
 
-    with patch('mongomock_motor.AsyncMongoMockCollection.update_one', new=async_wrapper(UpdateResult({}, False))):
+    with patch(
+        'mongomock_motor.AsyncMongoMockCollection.update_one',
+        new=async_wrapper(UpdateResult({}, False)),
+    ):
         with pytest.raises(RuntimeError):
             await sample_function(collection)
 
@@ -36,6 +42,8 @@ async def test_patch():
 async def test_patch_object():
     collection = AsyncMongoMockClient()['test']['test']
 
-    with patch.object(collection, 'update_one', new=async_wrapper(UpdateResult({}, False))):
+    with patch.object(
+        collection, 'update_one', new=async_wrapper(UpdateResult({}, False))
+    ):
         with pytest.raises(RuntimeError):
             await sample_function(collection)

tests/test_showcase.py

@@ -1,4 +1,5 @@
 import pytest
+
 from mongomock_motor import AsyncMongoMockClient
 
 

tests/test_umongo.py

@@ -26,7 +26,9 @@ class Meta:
     something1 = Something(field1='A', field2=':)', related=[])
     await something1.commit()
 
-    with pytest.raises(ValidationError, match="^{'field1': 'Field value must be unique.'}$"):
+    with pytest.raises(
+        ValidationError, match="^{'field1': 'Field value must be unique.'}$"
+    ):
         duplicate = Something(field1='A', field2=':)', related=[])
         await duplicate.commit()
 

tests/test_unique.py

@@ -1,5 +1,6 @@
 import pytest
 from pymongo.errors import DuplicateKeyError
+
 from mongomock_motor import AsyncMongoMockClient
 
 

tests/test_workflow.py

@@ -1,7 +1,9 @@
+from datetime import datetime, timezone
+
 import bson
 import pytest
-from datetime import datetime, timezone
 from pymongo import ReplaceOne
+
 from mongomock_motor import AsyncMongoMockClient
 
 
@@ -56,11 +58,7 @@ async def test_tz_awareness():
 @pytest.mark.anyio
 async def test_bulk_write():
     collection = AsyncMongoMockClient()['tests']['test']
-    result = await collection.bulk_write([
-        ReplaceOne(
-            filter={'_id': 1},
-            replacement={'_id': 1},
-            upsert=True
-        )
-    ])
+    result = await collection.bulk_write(
+        [ReplaceOne(filter={'_id': 1}, replacement={'_id': 1}, upsert=True)]
+    )
     assert result.bulk_api_result['nUpserted'] == 1