Merge 1440c91 into 4385e09

.gitignore

@@ -4,3 +4,5 @@
 /.env/
 /.eggs/
 /.idea/
+/.tox/
+/*.egg-info/

Makefile

@@ -6,6 +6,7 @@ virtualenv:
 
 develop: virtualenv
 	.env/bin/pip install --upgrade setuptools
+	.env/bin/pip install tox
 	.env/bin/pip install wheel
 	.env/bin/pip install twine
 	.env/bin/pip install Django==$(DJANGO_VERSION)

collectionfield/models/fields.py

@@ -220,10 +220,10 @@ def formfield(self, **kwargs):
         else:
             return super(CollectionField, self).formfield(**kwargs)
 
-    def contribute_to_class(self, cls, name, virtual_only=False):
+    def contribute_to_class(self, cls, name, **kwargs):
         """Overrides `get_FIELD_display` on model class"""
         super(CollectionField, self).contribute_to_class(
-            cls, name, virtual_only=virtual_only
+            cls, name, **kwargs
         )
         if self.choices:
             setattr(

collectionfield/tests/tests.py

@@ -853,7 +853,7 @@ def test_max_length_exceeded(self):
 
     def test_html_widget_without_value(self):
         bound_field = StringSetForm()['values']
-        self.assertEqual(
+        self.assertHTMLEqual(
             bound_field.as_widget(),
             '<input id="id_values" name="values" type="text"{req} />'.format(
                 req=' required' if DJANGO_110 else ''
@@ -862,7 +862,7 @@ def test_html_widget_without_value(self):
 
     def test_html_widget_with_value(self):
         bound_field = SortedStringListForm({'values': 'a, b, c'})['values']
-        self.assertEqual(
+        self.assertHTMLEqual(
             bound_field.as_widget(),
             '<input id="id_values" name="values" type="text" '
             'value="a, b, c"{req} />'.format(
@@ -1132,7 +1132,7 @@ def test_valid_empty_choice_optional_set_of_decimals(self):
 
     def test_html_widget_without_value(self):
         bound_field = GroupedChoiceDecimalTupleForm()['values']
-        self.assertEqual(
+        self.assertHTMLEqual(
             bound_field.as_widget(),
             '<select multiple="multiple" id="id_values" name="values"{req}>\n'
             '<optgroup label="Group 1">\n'
@@ -1150,7 +1150,7 @@ def test_html_widget_without_value(self):
 
     def test_html_widget_with_value(self):
         bound_field = ChoiceIntegerSetForm({'values': [1, 2]})['values']
-        self.assertEqual(
+        self.assertHTMLEqual(
             bound_field.as_widget(),
             '<select multiple="multiple" id="id_values" name="values"{req}>\n'
             '<option value="1" selected="selected">One</option>\n'

tox.ini

@@ -0,0 +1,21 @@
+[tox]
+envlist =
+    {py27,py34,py35}-django18
+    {py27,py34,py35}-django19
+    {py27,py34,py35}-django110
+    {py27,py34,py35,py36}-django111
+    {py34,py35,py36,py37}-django20
+    ; ^ as described in
+    ; https://docs.djangoproject.com/en/2.0/faq/install/#faq-python-version-support
+
+[testenv]
+deps =
+    -r requirements-test.pip
+    django18: Django>=1.8,<1.9
+    django19: Django>=1.9,<1.10
+    django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<1.12
+    django20: Django>=2.0,<2.1
+
+# commands = flake8 collectionfield --max-complexity=15
+commands = python setup.py test