Skip to content

Commit afb5d94

Browse files
authored
Merge pull request #222 from novafloss/compatibility-drf-lt-3.5
Compatibility drf lt 3.5
2 parents 0395ad1 + d3bdd66 commit afb5d94

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

CHANGELOG.rst

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ master (unreleased)
66
===================
77

88
- Use an atomic transaction in FormidableSerialize.save() (#220)
9+
- Ensure compatibility with Django REST Framework 3.3
910

1011
Release 0.9.0 (2017-04-11)
1112
==========================

formidable/serializers/list.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def validate(self, data):
6363
msg = 'The fields {field_id} must make a unique set.'.format(
6464
field_id=self.field_id
6565
)
66-
raise ValidationError(msg, code='unique')
66+
raise ValidationError(msg)
6767

6868
return data
6969

tox.ini

+4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
[tox]
22
envlist =
33
django18-py{27,34,35}
4+
django18-py{27,34,35}-drf33
45
django19-py{27,34,35}
6+
django19-py{27,34,35}-drf33
57
django110-py{27,34,35}
8+
django110-py{27,34,35}-drf33
69
flake8
710
isort-check
811
skipsdist = True
@@ -16,6 +19,7 @@ deps =
1619
django18: Django>=1.8,<1.9
1720
django19: Django>=1.9,<1.10
1821
django110: Django>=1.10,<1.11
22+
drf33: djangorestframework<3.4
1923
; Requirements from demo project
2024
py27: mock
2125
-rdemo/requirements-demo.pip

0 commit comments

Comments
 (0)