Skip to content

Commit 047dee8

Browse files
Bump isort from 4.3.4 to 5.6.4 (#743)
* Bump isort from 4.3.4 to 5.6.4 Bumps [isort](https://github.com/pycqa/isort) from 4.3.4 to 5.6.4. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/develop/CHANGELOG.md) - [Commits](PyCQA/isort@4.3.4...5.6.4) Signed-off-by: dependabot-preview[bot] <[email protected]> * Resort Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Andrew Svetlov <[email protected]>
1 parent 3aa486e commit 047dee8

File tree

6 files changed

+22
-15
lines changed

6 files changed

+22
-15
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ doc: clean-docs
88
@echo "open file://`pwd`/docs/_build/html/index.html"
99

1010
isort:
11-
isort -rc aiopg
12-
isort -rc tests
13-
isort -rc examples
11+
isort aiopg
12+
isort tests
13+
isort examples
1414

1515
flake: .flake
1616

@@ -19,9 +19,9 @@ flake: .flake
1919
$(shell find examples -type f)
2020
flake8 aiopg tests examples
2121
python setup.py check -rms
22-
@if ! isort -c -rc aiopg tests examples; then \
22+
@if ! isort -c aiopg tests examples; then \
2323
echo "Import sort errors, run 'make isort' to fix them!!!"; \
24-
isort --diff -rc aiopg tests examples; \
24+
isort --diff aiopg tests examples; \
2525
false; \
2626
fi
2727

aiopg/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import warnings
44
from collections import namedtuple
55

6-
from .connection import connect, Connection, TIMEOUT as DEFAULT_TIMEOUT
6+
from .connection import TIMEOUT as DEFAULT_TIMEOUT
7+
from .connection import Connection, connect
78
from .cursor import Cursor
8-
from .pool import create_pool, Pool
9+
from .pool import Pool, create_pool
910
from .transaction import IsolationLevel, Transaction
1011
from .utils import get_running_loop
1112

aiopg/sa/__init__.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
"""Optional support for sqlalchemy.sql dynamic query generation."""
22
from .connection import SAConnection
3-
from .engine import create_engine, Engine
4-
from .exc import (Error, ArgumentError, InvalidRequestError,
5-
NoSuchColumnError, ResourceClosedError)
6-
3+
from .engine import Engine, create_engine
4+
from .exc import (
5+
ArgumentError,
6+
Error,
7+
InvalidRequestError,
8+
NoSuchColumnError,
9+
ResourceClosedError,
10+
)
711

812
__all__ = ('create_engine', 'SAConnection', 'Error',
913
'ArgumentError', 'InvalidRequestError', 'NoSuchColumnError',

aiopg/sa/connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
from sqlalchemy.sql.ddl import DDLElement
33
from sqlalchemy.sql.dml import UpdateBase
44

5-
from . import exc
65
from ..utils import _SAConnectionContextManager, _TransactionContextManager
6+
from . import exc
77
from .result import ResultProxy
88
from .transaction import (
99
NestedTransaction,

aiopg/sa/engine.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
from .exc import InvalidRequestError
99

1010
try:
11-
from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2
12-
from sqlalchemy.dialects.postgresql.psycopg2 import PGCompiler_psycopg2
11+
from sqlalchemy.dialects.postgresql.psycopg2 import (
12+
PGCompiler_psycopg2,
13+
PGDialect_psycopg2,
14+
)
1315
except ImportError: # pragma: no cover
1416
raise ImportError('aiopg.sa requires sqlalchemy')
1517

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
coverage==5.3
22
docker==4.4.0
33
flake8==3.8.4
4-
isort==4.3.4
4+
isort==5.6.4
55
-e .[sa]
66
sphinx==3.3.1
77
pytest==6.1.2

0 commit comments

Comments
 (0)