From 3a808a03d63d910cb68afa29a94f9a9b17c2f7eb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 1 Jun 2016 15:14:58 +0100 Subject: [PATCH] Resolve isort differences between local and tox environments --- runtests.py | 2 +- tests/test_atomic_requests.py | 2 +- tests/test_generics.py | 6 +++--- tests/test_multitable_inheritance.py | 2 +- tests/test_permissions.py | 2 +- tests/test_relations_hyperlink.py | 6 +++--- tests/test_relations_pk.py | 4 ++-- tests/test_relations_slug.py | 4 ++-- tests/test_response.py | 2 +- tests/test_utils.py | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/runtests.py b/runtests.py index a7e8b45a9..1627e33b2 100755 --- a/runtests.py +++ b/runtests.py @@ -14,7 +14,7 @@ PYTEST_ARGS = { FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501'] -ISORT_ARGS = ['--recursive', '--check-only', 'rest_framework', 'tests'] +ISORT_ARGS = ['--recursive', '--check-only', '-p', 'tests', 'rest_framework', 'tests'] sys.path.append(os.path.dirname(__file__)) diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index 3e1d41725..8342ad3af 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -7,13 +7,13 @@ from django.db import connection, connections, transaction from django.http import Http404 from django.test import TestCase, TransactionTestCase from django.utils.decorators import method_decorator -from tests.models import BasicModel from rest_framework import status from rest_framework.exceptions import APIException from rest_framework.response import Response from rest_framework.test import APIRequestFactory from rest_framework.views import APIView +from tests.models import BasicModel factory = APIRequestFactory() diff --git a/tests/test_generics.py b/tests/test_generics.py index b81a02fc3..2e47df50f 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -5,13 +5,13 @@ from django.db import models from django.shortcuts import get_object_or_404 from django.test import TestCase from django.utils import six -from tests.models import ( - BasicModel, ForeignKeySource, ForeignKeyTarget, RESTFrameworkModel -) from rest_framework import generics, renderers, serializers, status from rest_framework.response import Response from rest_framework.test import APIRequestFactory +from tests.models import ( + BasicModel, ForeignKeySource, ForeignKeyTarget, RESTFrameworkModel +) factory = APIRequestFactory() diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index 5867f1966..340d4966a 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals from django.db import models from django.test import TestCase -from tests.models import RESTFrameworkModel from rest_framework import serializers +from tests.models import RESTFrameworkModel # Models diff --git a/tests/test_permissions.py b/tests/test_permissions.py index f36b8f4da..e04c72ec9 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -7,7 +7,6 @@ from django.contrib.auth.models import Group, Permission, User from django.core.urlresolvers import ResolverMatch from django.db import models from django.test import TestCase -from tests.models import BasicModel from rest_framework import ( HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers, @@ -17,6 +16,7 @@ from rest_framework.compat import guardian from rest_framework.filters import DjangoObjectPermissionsFilter from rest_framework.routers import DefaultRouter from rest_framework.test import APIRequestFactory +from tests.models import BasicModel factory = APIRequestFactory() diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index 27e1d1449..05d8689a3 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals from django.conf.urls import url from django.test import TestCase, override_settings + +from rest_framework import serializers +from rest_framework.test import APIRequestFactory from tests.models import ( ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget, NullableForeignKeySource, NullableOneToOneSource, OneToOneTarget ) -from rest_framework import serializers -from rest_framework.test import APIRequestFactory - factory = APIRequestFactory() request = factory.get('/') # Just to ensure we have a request in the serializer context diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index c82188ede..ba75bd94f 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals from django.test import TestCase from django.utils import six + +from rest_framework import serializers from tests.models import ( ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget, NullableForeignKeySource, NullableOneToOneSource, NullableUUIDForeignKeySource, OneToOneTarget, UUIDForeignKeyTarget ) -from rest_framework import serializers - # ManyToMany class ManyToManyTargetSerializer(serializers.ModelSerializer): diff --git a/tests/test_relations_slug.py b/tests/test_relations_slug.py index cee18031d..680aee417 100644 --- a/tests/test_relations_slug.py +++ b/tests/test_relations_slug.py @@ -1,10 +1,10 @@ from django.test import TestCase + +from rest_framework import serializers from tests.models import ( ForeignKeySource, ForeignKeyTarget, NullableForeignKeySource ) -from rest_framework import serializers - class ForeignKeyTargetSerializer(serializers.ModelSerializer): sources = serializers.SlugRelatedField( diff --git a/tests/test_response.py b/tests/test_response.py index 28ea90ce4..c8ae6475a 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from django.conf.urls import include, url from django.test import TestCase, override_settings from django.utils import six -from tests.models import BasicModel from rest_framework import generics, routers, serializers, status, viewsets from rest_framework.parsers import JSONParser @@ -12,6 +11,7 @@ from rest_framework.renderers import ( ) from rest_framework.response import Response from rest_framework.views import APIView +from tests.models import BasicModel # Serializer used to test BasicModel diff --git a/tests/test_utils.py b/tests/test_utils.py index 70ba7644a..cd6a6af9a 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -4,12 +4,12 @@ from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.test import TestCase, override_settings from django.utils import six -from tests.models import BasicModel import rest_framework.utils.model_meta from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.utils.model_meta import _resolve_model from rest_framework.views import APIView +from tests.models import BasicModel class Root(APIView):