Skip to content
This repository was archived by the owner on Dec 15, 2020. It is now read-only.

Commit cd89efa

Browse files
committed
Fix CI
1 parent eb41292 commit cd89efa

5 files changed

Lines changed: 15 additions & 13 deletions

File tree

aiocassandra/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from aiocassandra.session import aiosession
21
from aiocassandra.cqlengine.models import AioModel
2+
from aiocassandra.session import aiosession
33

44
__all__ = ['aiosession', 'AioModel']

aiocassandra/cqlengine/query.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
"""
44
from warnings import warn
55

6-
from cassandra.cqlengine.query import (DMLQuery, ModelQuerySet, check_applied,
7-
SimpleStatement, conn, ValidationError,
8-
EqualsOperator)
9-
from cassandra.cqlengine import CQLEngineException
10-
from cassandra.cqlengine import columns
11-
from cassandra.cqlengine.statements import (UpdateStatement, DeleteStatement,
12-
BaseCQLStatement, InsertStatement)
6+
from cassandra.cqlengine import CQLEngineException, columns
7+
from cassandra.cqlengine.query import (DMLQuery, EqualsOperator, ModelQuerySet,
8+
SimpleStatement, ValidationError,
9+
check_applied, conn)
10+
from cassandra.cqlengine.statements import (BaseCQLStatement, DeleteStatement,
11+
InsertStatement, UpdateStatement)
1312

1413

1514
async def _execute_statement(model,
@@ -325,7 +324,8 @@ async def async_update(self, **values):
325324
if col_op == 'remove' and isinstance(col, columns.Map):
326325
if not isinstance(val, set):
327326
raise ValidationError(
328-
"Cannot apply update operation '{0}' on column '{1}' with value '{2}'. A set is required."
327+
"Cannot apply update operation '{0}' on column '{1}' "
328+
"with value '{2}'. A set is required."
329329
.format(col_op, col_name, val))
330330
val = {v: None for v in val}
331331
else:

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import pytest
66
from cassandra.cluster import Cluster
7-
from cassandra.cqlengine import management
87
from cassandra.cqlengine import connection as cqlengine_connection
8+
from cassandra.cqlengine import management
99

1010
from aiocassandra import aiosession
1111

tests/test_async_cqlengine.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ async def test_queryset_async_functions(cqlengine_management):
2121
"""
2222
cqlengine_management.sync_table(User)
2323

24-
# test: Model.objects.async_create(), Model.objects.async_all(), Model.objects.async_get()
24+
# test: Model.objects.async_create()
25+
# Model.objects.async_all()
26+
# Model.objects.async_get()
2527
username1 = 'test-username-1'
2628
await User.objects.async_create(user_id=uuid.uuid4(), username=username1)
2729
users = await User.objects.async_all()

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ deps =
99
flake8
1010
isort
1111
commands =
12-
flake8 --show-source aiocassandra.py setup.py
13-
isort --check-only aiocassandra.py setup.py
12+
flake8 --show-source aiocassandra
13+
isort --check-only -rc aiocassandra
1414
flake8 --show-source tests
1515
isort --check-only -rc tests --diff
1616

0 commit comments

Comments
 (0)