Simplify isort config

.editorconfig

@@ -9,6 +9,7 @@ trim_trailing_whitespace = true
 
 [*.py]
 indent_size = 4
+combine_as_imports = true
 max_line_length = 79
 multi_line_output = 4
 quote_type = single

saleor/core/analytics.py

@@ -1,8 +1,8 @@
 import uuid
 
+import google_measurement_protocol as ga
 from celery import shared_task
 from django.conf import settings
-import google_measurement_protocol as ga
 
 FINGERPRINT_PARTS = [
     'HTTP_ACCEPT_ENCODING',

saleor/core/utils/random_data.py

@@ -1,8 +1,8 @@
-from collections import defaultdict
 import itertools
 import os
 import random
 import unicodedata
+from collections import defaultdict
 
 from django.conf import settings
 from django.contrib.auth.models import Group, Permission

saleor/graphql/core/types.py

@@ -1,5 +1,5 @@
-from django_prices.templatetags import prices_i18n
 import graphene
+from django_prices.templatetags import prices_i18n
 
 
 class PriceType(graphene.ObjectType):

saleor/graphql/product/types.py

@@ -1,8 +1,8 @@
 import functools
 import operator
 
-from django.db.models import Q
 import graphene
+from django.db.models import Q
 from graphene import relay
 from graphene_django import DjangoConnectionField, DjangoObjectType
 

saleor/product/views.py

@@ -12,8 +12,8 @@
 from .models import Category, Collection
 from .utils import (
     get_availability, get_product_attributes_data, get_product_images,
-    get_variant_picker_data, handle_cart_form, product_json_ld,
-    products_for_cart, get_product_list_context, products_with_details)
+    get_product_list_context, get_variant_picker_data, handle_cart_form,
+    product_json_ld, products_for_cart, products_with_details)
 
 
 def product_details(request, slug, product_id, form=None):

saleor/settings.py

@@ -3,8 +3,8 @@
 
 import dj_database_url
 import dj_email_url
-from django.contrib.messages import constants as messages
 import django_cache_url
+from django.contrib.messages import constants as messages
 
 
 def get_list(text):

saleor/userprofile/i18n.py

@@ -1,10 +1,10 @@
 from collections import defaultdict
 
+import i18naddress
 from django import forms
 from django.forms.forms import BoundField
 from django.utils.translation import pgettext_lazy
 from django_countries.data import COUNTRIES
-import i18naddress
 from phonenumber_field.formfields import PhoneNumberField
 
 from .models import Address

saleor/userprofile/templatetags/i18n_address_tags.py

@@ -1,6 +1,6 @@
+import i18naddress
 from django import template
 from django.utils.translation import pgettext
-import i18naddress
 
 register = template.Library()
 

setup.cfg

@@ -41,12 +41,10 @@ inherit = false
 match-dir = (?!migrations)[^\.].*
 
 [isort]
-skip = migrations,
-indent = '    '
-multi_line_output = 4
-length_sort = false
-balanced_wrapping = false
-combine_as_imports = true
-combine_star = true
-use_parentheses = true
-force_sort_within_sections = true
+skip =
+    .direnv
+    .tox
+    .venv
+    docs
+    migrations
+    node_modules

tests/dashboard/test_chips.py

@@ -2,9 +2,9 @@
 from django.http import QueryDict
 
 from saleor.dashboard.templatetags.chips import (
-    CHIPS_PATTERN, handle_default, handle_single_choice,
-    handle_multiple_choice, handle_nullboolean, handle_single_model_choice,
-    handle_multiple_model_choice, handle_range)
+    CHIPS_PATTERN, handle_default, handle_multiple_choice,
+    handle_multiple_model_choice, handle_nullboolean, handle_range,
+    handle_single_choice, handle_single_model_choice)
 from saleor.dashboard.widgets import PriceRangeWidget
 from saleor.product.models import Category, Product
 

tests/dashboard/test_order.py

@@ -1,17 +1,15 @@
 from decimal import Decimal
 from unittest.mock import patch
 
-from django.urls import reverse
 import pytest
+from django.urls import reverse
 from django_fsm import TransitionNotAllowed
 from prices import Price
-
 from tests.utils import get_redirect_location, get_url_path
 
 from saleor.cart.models import Cart
-from saleor.dashboard.order.forms import ChangeQuantityForm
+from saleor.dashboard.order.forms import ChangeQuantityForm, OrderNoteForm
 from saleor.order import GroupStatus
-from saleor.dashboard.order.forms import OrderNoteForm
 from saleor.order.models import (
     DeliveryGroup, Order, OrderHistoryEntry, OrderLine, OrderNote)
 from saleor.order.transitions import process_delivery_group

tests/dashboard/test_product.py

@@ -1,22 +1,21 @@
-from io import BytesIO
 import json
+from io import BytesIO
+from unittest.mock import MagicMock, Mock
 
-from unittest.mock import Mock, MagicMock
-
-from PIL import Image
+import pytest
 from django.conf import settings
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.forms import HiddenInput
 from django.urls import reverse
 from django.utils.encoding import smart_text
-import pytest
+from PIL import Image
 
 from saleor.dashboard.product import ProductBulkAction
 from saleor.dashboard.product.forms import (
-    ProductBulkUpdate, ProductTypeForm, ProductForm)
+    ProductBulkUpdate, ProductForm, ProductTypeForm)
 from saleor.product.forms import VariantChoiceField
 from saleor.product.models import (
-    Collection, AttributeChoiceValue, Product, ProductAttribute, ProductImage,
+    AttributeChoiceValue, Collection, Product, ProductAttribute, ProductImage,
     ProductType, ProductVariant, Stock, StockLocation)
 
 HTTP_STATUS_OK = 200

tests/dashboard/test_site_settings.py

@@ -1,9 +1,9 @@
+import pytest
 from django.contrib.sites.models import Site
 from django.db.utils import IntegrityError
 from django.test.client import RequestFactory
 from django.urls import reverse
 from django.utils.encoding import smart_text
-import pytest
 
 from saleor.dashboard.sites.forms import SiteForm, SiteSettingsForm
 from saleor.site import utils

tests/test_cart.py

@@ -1,15 +1,15 @@
 import json
-from uuid import uuid4
 from unittest.mock import MagicMock, Mock
+from uuid import uuid4
 
+import pytest
 from django.contrib.auth.models import AnonymousUser
 from django.core import signing
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponse
 from django.urls import reverse
 from django_babel.templatetags.babel import currencyfmt
 from prices import Price
-import pytest
 from satchless.item import InsufficientStock
 
 from saleor.cart import CartStatus, forms, utils

tests/test_checkout.py

@@ -1,15 +1,14 @@
 from unittest.mock import MagicMock, Mock
 
+import pytest
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 from prices import Price
-import pytest
 from satchless.item import InsufficientStock
 
 from saleor.checkout import views
 from saleor.checkout.core import STORAGE_SESSION_KEY, Checkout
 from saleor.checkout.forms import NoteForm
-
 from saleor.shipping.models import ShippingMethodCountry
 from saleor.userprofile.models import Address
 

tests/test_collection.py

@@ -1,11 +1,11 @@
 import pytest
-
 from django.urls import reverse
 
-from .utils import get_redirect_location
 from saleor.dashboard.collection.forms import CollectionForm
 from saleor.product.models import Collection
 
+from .utils import get_redirect_location
+
 
 @pytest.fixture
 def collection(db):

tests/test_core.py

@@ -12,7 +12,6 @@
 from saleor.shipping.models import ShippingMethod
 from saleor.userprofile.models import Address, User
 
-
 type_schema = {
     'Vegetable': {
         'category': 'Food',

tests/test_elasticsearch.py

@@ -1,8 +1,8 @@
 from decimal import Decimal
 
+import pytest
 from django.urls import reverse
 from elasticsearch_dsl.connections import connections
-import pytest
 
 from saleor.order.models import Order
 from saleor.product.models import Product

tests/test_order.py

@@ -1,11 +1,12 @@
 from decimal import Decimal
+
 from django.urls import reverse
 from prices import Price
+from tests.utils import get_redirect_location
 
-from saleor.order import models, OrderStatus
+from saleor.order import OrderStatus, models
 from saleor.order.forms import OrderNoteForm
 from saleor.order.utils import add_variant_to_delivery_group
-from tests.utils import get_redirect_location
 
 
 def test_total_property():

tests/test_postgresql_search.py

@@ -1,10 +1,11 @@
-from saleor.product.models import Product
-from saleor.order.models import Order
-from saleor.userprofile.models import Address, User
-
-from django.urls import reverse
 from decimal import Decimal
+
 import pytest
+from django.urls import reverse
+
+from saleor.order.models import Order
+from saleor.product.models import Product
+from saleor.userprofile.models import Address, User
 
 
 @pytest.fixture(scope='function', autouse=True)

tests/test_registration.py

@@ -1,7 +1,7 @@
+import pytest
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
 from django.urls import reverse
-import pytest
 
 from saleor.registration.backends import BaseBackend
 from saleor.registration.forms import LoginForm, SignupForm