Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
==========================
Expand Down
5 changes: 2 additions & 3 deletions formidable/serializers/access.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
1 change: 1 addition & 0 deletions formidable/serializers/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from __future__ import unicode_literals

import six

from rest_framework import serializers


Expand Down
3 changes: 1 addition & 2 deletions formidable/serializers/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions formidable/serializers/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions formidable/serializers/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions formidable/serializers/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
9 changes: 4 additions & 5 deletions formidable/serializers/presets.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 2 additions & 3 deletions formidable/serializers/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
14 changes: 7 additions & 7 deletions formidable/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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__)

Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -34,6 +35,7 @@ commands =
changedir =
{toxinidir}
deps = isort
skip_install = True
whitelist_externals = cat
commands =
cat setup.cfg
Expand Down