Add isort, rename nox session blacken->format

docs/conf.py

@@ -28,8 +28,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
 import datetime
+import os
+
 import elasticsearch_dsl
 
 # If extensions (or modules to document with autodoc) are in another directory,

elasticsearch_dsl/__init__.py

@@ -16,11 +16,25 @@
 #  under the License.
 
 from . import connections
-from .query import Q
 from .aggs import A
-from .function import SF
-from .search import Search, MultiSearch
-from .update_by_query import UpdateByQuery
+from .analysis import analyzer, char_filter, normalizer, token_filter, tokenizer
+from .document import Document, InnerDoc, MetaField
+from .exceptions import (
+    ElasticsearchDslException,
+    IllegalOperation,
+    UnknownDslObject,
+    ValidationException,
+)
+from .faceted_search import (
+    DateHistogramFacet,
+    Facet,
+    FacetedResponse,
+    FacetedSearch,
+    HistogramFacet,
+    NestedFacet,
+    RangeFacet,
+    TermsFacet,
+)
 from .field import (
     Binary,
     Boolean,
@@ -60,28 +74,14 @@
     TokenCount,
     construct_field,
 )
-from .document import Document, MetaField, InnerDoc
-from .exceptions import (
-    ElasticsearchDslException,
-    IllegalOperation,
-    UnknownDslObject,
-    ValidationException,
-)
-from .mapping import Mapping
+from .function import SF
 from .index import Index, IndexTemplate
-from .analysis import analyzer, char_filter, normalizer, token_filter, tokenizer
-from .faceted_search import (
-    DateHistogramFacet,
-    Facet,
-    FacetedResponse,
-    FacetedSearch,
-    HistogramFacet,
-    NestedFacet,
-    RangeFacet,
-    TermsFacet,
-)
-from .wrappers import Range
+from .mapping import Mapping
+from .query import Q
+from .search import MultiSearch, Search
+from .update_by_query import UpdateByQuery
 from .utils import AttrDict, AttrList, DslBase
+from .wrappers import Range
 
 VERSION = (7, 2, 0)
 __version__ = VERSION

elasticsearch_dsl/aggs.py

@@ -20,8 +20,8 @@
 except ImportError:
     import collections as collections_abc
 
+from .response.aggs import AggResponse, BucketData, FieldBucketData, TopHitsData
 from .utils import DslBase
-from .response.aggs import BucketData, FieldBucketData, AggResponse, TopHitsData
 
 
 def A(name_or_agg, filter=None, **params):

elasticsearch_dsl/connections.py

@@ -15,9 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from six import string_types
-
 from elasticsearch import Elasticsearch
+from six import string_types
 
 from .serializer import serializer
 

elasticsearch_dsl/faceted_search.py

@@ -15,14 +15,15 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from datetime import timedelta, datetime
+from datetime import datetime, timedelta
+
 from six import iteritems, itervalues
 
-from .search import Search
 from .aggs import A
-from .utils import AttrDict
+from .query import MatchAll, Nested, Range, Terms
 from .response import Response
-from .query import Terms, Nested, Range, MatchAll
+from .search import Search
+from .utils import AttrDict
 
 __all__ = [
     "FacetedSearch",

elasticsearch_dsl/field.py

@@ -27,12 +27,12 @@
 from datetime import date, datetime
 
 from dateutil import parser, tz
-from six import string_types, iteritems, integer_types
+from six import integer_types, iteritems, string_types
 from six.moves import map
 
-from .query import Q
-from .utils import DslBase, AttrDict, AttrList
 from .exceptions import ValidationException
+from .query import Q
+from .utils import AttrDict, AttrList, DslBase
 from .wrappers import Range
 
 unicode = type(u"")

elasticsearch_dsl/query.py

@@ -22,12 +22,11 @@
 
 from itertools import chain
 
-from .utils import DslBase
-from .function import ScoreFunction
-
 # 'SF' looks unused but the test suite assumes it's available
 # from this module so others are liable to do so as well.
 from .function import SF  # noqa: F401
+from .function import ScoreFunction
+from .utils import DslBase
 
 
 def Q(name_or_query="match_all", **params):

elasticsearch_dsl/response/__init__.py

@@ -16,7 +16,6 @@
 #  under the License.
 
 from ..utils import AttrDict, AttrList, _wrap
-
 from .hit import Hit, HitMeta
 
 __all__ = ["Response", "AggResponse", "UpdateByQueryResponse", "Hit", "HitMeta"]

elasticsearch_dsl/response/aggs.py

@@ -16,7 +16,7 @@
 #  under the License.
 
 from ..utils import AttrDict, AttrList
-from . import Response, AggResponse
+from . import AggResponse, Response
 
 
 class Bucket(AggResponse):

elasticsearch_dsl/search.py

@@ -22,17 +22,16 @@
 except ImportError:
     import collections as collections_abc
 
-from six import iteritems, string_types
-
-from elasticsearch.helpers import scan
 from elasticsearch.exceptions import TransportError
+from elasticsearch.helpers import scan
+from six import iteritems, string_types
 
-from .query import Q, Bool
 from .aggs import A, AggBase
-from .utils import DslBase, AttrDict
-from .response import Response, Hit
 from .connections import get_connection
 from .exceptions import IllegalOperation
+from .query import Bool, Q
+from .response import Hit, Response
+from .utils import AttrDict, DslBase
 
 
 class QueryProxy(object):

elasticsearch_dsl/utils.py

@@ -24,7 +24,7 @@
 
 from copy import copy
 
-from six import iteritems, add_metaclass
+from six import add_metaclass, iteritems
 from six.moves import map
 
 from .exceptions import UnknownDslObject, ValidationException

elasticsearch_dsl/wrappers.py

@@ -17,7 +17,7 @@
 
 import operator
 
-from six import string_types, iteritems
+from six import iteritems, string_types
 
 from .utils import AttrDict
 

examples/alias_migration.py

@@ -38,7 +38,7 @@
 from datetime import datetime
 from fnmatch import fnmatch
 
-from elasticsearch_dsl import Document, Date, Text, Keyword, connections
+from elasticsearch_dsl import Date, Document, Keyword, Text, connections
 
 ALIAS = "test-blog"
 PATTERN = ALIAS + "-*"

examples/completion.py

@@ -31,13 +31,13 @@
 from itertools import permutations
 
 from elasticsearch_dsl import (
-    connections,
-    Document,
     Completion,
-    Text,
-    Long,
+    Document,
     Keyword,
+    Long,
+    Text,
     analyzer,
+    connections,
     token_filter,
 )
 

examples/composite_agg.py

@@ -17,7 +17,7 @@
 
 from __future__ import print_function
 
-from elasticsearch_dsl import connections, Search, A
+from elasticsearch_dsl import A, Search, connections
 
 
 def scan_aggs(search, source_aggs, inner_aggs={}, size=10):

examples/parent_child.py

@@ -42,16 +42,16 @@
 from datetime import datetime
 
 from elasticsearch_dsl import (
-    Document,
-    Date,
-    Text,
-    Keyword,
     Boolean,
+    Date,
+    Document,
     InnerDoc,
-    Nested,
-    Object,
     Join,
+    Keyword,
     Long,
+    Nested,
+    Object,
+    Text,
     connections,
 )
 

examples/percolate.py

@@ -17,12 +17,12 @@
 
 from elasticsearch_dsl import (
     Document,
-    Percolator,
-    Text,
     Keyword,
-    connections,
+    Percolator,
     Q,
     Search,
+    Text,
+    connections,
 )
 
 

examples/search_as_you_type.py

@@ -28,11 +28,11 @@
 from __future__ import print_function, unicode_literals
 
 from elasticsearch_dsl import (
-    connections,
     Document,
+    SearchAsYouType,
     analyzer,
+    connections,
     token_filter,
-    SearchAsYouType,
 )
 from elasticsearch_dsl.query import MultiMatch
 

noxfile.py

@@ -17,7 +17,6 @@
 
 import nox
 
-
 SOURCE_FILES = (
     "setup.py",
     "noxfile.py",
@@ -37,22 +36,30 @@ def test(session):
 
 
 @nox.session()
-def blacken(session):
-    session.install("black")
-
-    session.run("black", "--target-version=py27", *SOURCE_FILES)
-    session.run("python", "utils/license_headers.py", "fix", *SOURCE_FILES)
+def format(session):
+    session.install("black", "isort")
+    session.run(
+        "black", "--target-version=py27", "--target-version=py37", *SOURCE_FILES
+    )
+    session.run("isort", *SOURCE_FILES)
+    session.run("python", "utils/license-headers.py", "fix", *SOURCE_FILES)
 
     lint(session)
 
 
-@nox.session()
+@nox.session
 def lint(session):
-    session.install("flake8", "black")
-
-    session.run("black", "--target-version=py27", "--check", *SOURCE_FILES)
-    session.run("flake8", "--max-line-length=100", "--ignore=E741,W503", *SOURCE_FILES)
-    session.run("python", "utils/license_headers.py", "check", *SOURCE_FILES)
+    session.install("flake8", "black", "isort")
+    session.run(
+        "black",
+        "--check",
+        "--target-version=py27",
+        "--target-version=py37",
+        *SOURCE_FILES
+    )
+    session.run("isort", "--check", *SOURCE_FILES)
+    session.run("flake8", "--ignore=E501,E741,W503", *SOURCE_FILES)
+    session.run("python", "utils/license-headers.py", "check", *SOURCE_FILES)
 
 
 @nox.session()

setup.cfg

@@ -5,3 +5,6 @@ all_files = 1
 
 [wheel]
 universal = 1
+
+[isort]
+profile = black

setup.py

@@ -16,8 +16,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from os.path import join, dirname
-from setuptools import setup, find_packages
+from os.path import dirname, join
+
+from setuptools import find_packages, setup
 
 VERSION = (7, 2, 0)
 __version__ = VERSION

test_elasticsearch_dsl/conftest.py

@@ -25,15 +25,16 @@
 from mock import Mock
 from pytest import fixture, skip
 
-from elasticsearch_dsl.connections import connections, add_connection
+from elasticsearch_dsl.connections import add_connection, connections
+
 from .test_integration.test_data import (
     DATA,
     FLAT_DATA,
     TEST_GIT_DATA,
-    create_git_index,
     create_flat_git_index,
+    create_git_index,
 )
-from .test_integration.test_document import PullRequest, Comment, User, History
+from .test_integration.test_document import Comment, History, PullRequest, User
 
 
 @fixture(scope="session")

test_elasticsearch_dsl/test_aggs.py

@@ -15,10 +15,10 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from elasticsearch_dsl import aggs, query
-
 from pytest import raises
 
+from elasticsearch_dsl import aggs, query
+
 
 def test_repr():
     max_score = aggs.Max(field="score")