diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b8c96fe8..520a40e2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,7 @@ master (unreleased) * Fix: excluding the `.crowdin` directory in the flake8 tox job (#179). * Return the preview mode (form or table) with the accesses list (#121) +* Fix: avoid installing formidable when not needed in tests - flake8 + isort checks (#181). Release 0.7.0 (2016-02-15) ========================== diff --git a/formidable/serializers/access.py b/formidable/serializers/access.py index 03eaba49..91a0ebda 100644 --- a/formidable/serializers/access.py +++ b/formidable/serializers/access.py @@ -2,13 +2,12 @@ from __future__ import unicode_literals -from rest_framework import serializers -from rest_framework.serializers import ValidationError - from formidable.accesses import get_accesses from formidable.constants import EDITABLE from formidable.models import Access from formidable.serializers.list import NestedListSerializer +from rest_framework import serializers +from rest_framework.serializers import ValidationError class SimpleAccessSerializer(serializers.BaseSerializer): diff --git a/formidable/serializers/common.py b/formidable/serializers/common.py index 6113dfba..209e0994 100644 --- a/formidable/serializers/common.py +++ b/formidable/serializers/common.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import six + from rest_framework import serializers diff --git a/formidable/serializers/defaults.py b/formidable/serializers/defaults.py index fe17cc4b..f3cf7f79 100644 --- a/formidable/serializers/defaults.py +++ b/formidable/serializers/defaults.py @@ -2,10 +2,9 @@ from __future__ import unicode_literals -from rest_framework import serializers - from formidable.models import Default from formidable.serializers.list import NestedListSerializerDummyUpdate +from rest_framework import serializers class DefaultListSerializer(NestedListSerializerDummyUpdate): diff --git a/formidable/serializers/fields.py b/formidable/serializers/fields.py index fb7bac8d..85dea00b 100644 --- a/formidable/serializers/fields.py +++ b/formidable/serializers/fields.py @@ -5,8 +5,6 @@ from django.db.models import Prefetch from django.utils.functional import cached_property -from rest_framework import serializers - from formidable import constants from formidable.models import Access, Field, Item from formidable.register import FieldSerializerRegister, load_serializer @@ -17,6 +15,7 @@ from formidable.serializers.items import ItemSerializer from formidable.serializers.list import NestedListSerializer from formidable.serializers.validation import ValidationSerializer +from rest_framework import serializers BASE_FIELDS = ( 'slug', 'label', 'type_id', 'placeholder', 'help_text', diff --git a/formidable/serializers/forms.py b/formidable/serializers/forms.py index 29f3d58b..d6768836 100644 --- a/formidable/serializers/forms.py +++ b/formidable/serializers/forms.py @@ -4,12 +4,11 @@ from django.core.exceptions import ValidationError -from rest_framework import serializers - from formidable.models import Formidable from formidable.serializers import fields from formidable.serializers.common import WithNestedSerializer from formidable.serializers.presets import PresetModelSerializer +from rest_framework import serializers class FormidableSerializer(WithNestedSerializer): diff --git a/formidable/serializers/items.py b/formidable/serializers/items.py index c6f3f4eb..62ccea7d 100644 --- a/formidable/serializers/items.py +++ b/formidable/serializers/items.py @@ -2,10 +2,9 @@ from __future__ import unicode_literals -from rest_framework import serializers - from formidable.models import Item from formidable.serializers.list import NestedListSerializer +from rest_framework import serializers class ItemListSerializer(NestedListSerializer): diff --git a/formidable/serializers/presets.py b/formidable/serializers/presets.py index 1c518497..c0817130 100644 --- a/formidable/serializers/presets.py +++ b/formidable/serializers/presets.py @@ -2,16 +2,15 @@ from __future__ import unicode_literals -from rest_framework import fields -from rest_framework.serializers import ( - CharField, ListSerializer, ModelSerializer, Serializer, ValidationError -) - from formidable.forms.validations.presets import presets_register from formidable.models import Preset, PresetArg from formidable.serializers.child_proxy import LazyChildProxy from formidable.serializers.common import WithNestedSerializer from formidable.serializers.list import NestedListSerializerDummyUpdate +from rest_framework import fields +from rest_framework.serializers import ( + CharField, ListSerializer, ModelSerializer, Serializer, ValidationError +) class ClassAttrSerializer(object): diff --git a/formidable/serializers/validation.py b/formidable/serializers/validation.py index 1ac873a2..94d81533 100644 --- a/formidable/serializers/validation.py +++ b/formidable/serializers/validation.py @@ -4,12 +4,11 @@ import re -from rest_framework import serializers -from rest_framework.serializers import ValidationError - from formidable.models import Validation from formidable.register import ValidationSerializerRegister, load_serializer from formidable.serializers.child_proxy import LazyChildProxy +from rest_framework import serializers +from rest_framework.serializers import ValidationError validation_register = ValidationSerializerRegister.get_instance() diff --git a/formidable/views.py b/formidable/views.py index f6eaed00..df3da22f 100644 --- a/formidable/views.py +++ b/formidable/views.py @@ -7,13 +7,6 @@ from django.core.exceptions import ImproperlyConfigured import six -from rest_framework import exceptions -from rest_framework.generics import ( - CreateAPIView, RetrieveAPIView, RetrieveUpdateAPIView -) -from rest_framework.response import Response -from rest_framework.settings import import_from_string, perform_import -from rest_framework.views import APIView from formidable.accesses import get_accesses, get_context from formidable.forms.field_builder import ( @@ -24,6 +17,13 @@ from formidable.serializers import FormidableSerializer, SimpleAccessSerializer from formidable.serializers.forms import ContextFormSerializer from formidable.serializers.presets import PresetsSerializer +from rest_framework import exceptions +from rest_framework.generics import ( + CreateAPIView, RetrieveAPIView, RetrieveUpdateAPIView +) +from rest_framework.response import Response +from rest_framework.settings import import_from_string, perform_import +from rest_framework.views import APIView logger = logging.getLogger(__name__) diff --git a/tox.ini b/tox.ini index 62c718ab..3c79eeca 100644 --- a/tox.ini +++ b/tox.ini @@ -25,6 +25,7 @@ commands = changedir = {toxinidir} deps = flake8 +skip_install = True commands = ; excluding git and cache dirs, tox-related dirs (default) ; excluding .crowdin directory (used for i18n processing) @@ -34,6 +35,7 @@ commands = changedir = {toxinidir} deps = isort +skip_install = True whitelist_externals = cat commands = cat setup.cfg