[7.x] Add isort, rename nox session blacken->format

Author: sethmlarson

.travis.yml

@@ -24,6 +24,8 @@ matrix:
         - python -m pip install nox
       script:
         - nox -s lint
+  allow_failures:
+    - python: "nightly"
 
 install:
   - mkdir /tmp/elasticsearch

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, 3, 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):