Merge branch 'xbello-develop' into develop

* xbello-develop:
  fix: build_attrs is supposed to merge self.attrs and any supplied attrs
  Changed the build_attrs to work with Django==1.11.

# Conflicts:
#	ajax_select/fields.py
#	tox.ini

Author: crucialfelix

ajax_select/fields.py

@@ -61,7 +61,9 @@ def __init__(self,
 
     def render(self, name, value, attrs=None):
         value = value or ''
-        final_attrs = self.build_attrs(attrs)
+
+        final_attrs = self.build_attrs(self.attrs)
+        final_attrs.update(attrs or {})
         final_attrs.pop('required', None)
         self.html_id = final_attrs.pop('id', name)
 
@@ -180,7 +182,8 @@ def render(self, name, value, attrs=None):
         if value is None:
             value = []
 
-        final_attrs = self.build_attrs(attrs)
+        final_attrs = self.build_attrs(self.attrs)
+        final_attrs.update(attrs or {})
         final_attrs.pop('required', None)
         self.html_id = final_attrs.pop('id', name)
 
@@ -327,8 +330,8 @@ def __init__(self, channel, *args, **kwargs):
     def render(self, name, value, attrs=None):
 
         initial = value or ''
-
-        final_attrs = self.build_attrs(attrs)
+        final_attrs = self.build_attrs(self.attrs)
+        final_attrs.update(attrs or {})
         self.html_id = final_attrs.pop('id', name)
         final_attrs.pop('required', None)
 

tox.ini

@@ -7,7 +7,7 @@
 [tox]
 envlist =
   {py27,py34}-flake8,
-  {py27,py34}-dj{17,18,19,110}
+  {py27,py34}-{dj17,dj18,dj19,dj110,dj111}
 skip_missing_interpreters = true
 
 
@@ -17,29 +17,34 @@ setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/ajax_select:{toxinidir}/tests
 commands = django-admin.py test tests
 deps =
-  dj16: Django>=1.6,<1.7
   dj17: Django>=1.7,<1.8
   dj18: Django>=1.8,<1.9
   dj19: Django>=1.9,<1.10
   dj110: Django>=1.10,<1.11
+  dj111: Django>=1.11,<1.12
   ; djmaster: https://github.com/django/django/zipball/master
 
 [testenv:py27-flake8]
 deps =
   flake8
 commands = flake8 ajax_select tests example
 
-[testenv:py33-flake8]
-deps =
-  flake8
-commands = flake8 ajax_select tests example
-
 [testenv:py34-flake8]
 deps =
   flake8
 commands = flake8 ajax_select tests example
 
-[testenv:py35-flake8]
-deps =
-  flake8
-commands = flake8 ajax_select tests example
+; [testenv:py35-flake8]
+; deps =
+;   flake8
+; commands = flake8 ajax_select tests example
+;
+; [testenv:py36-flake8]
+; deps =
+;   flake8
+; commands = flake8 ajax_select tests example
+;
+; [testenv:py37-flake8]
+; deps =
+;   flake8
+; commands = flake8 ajax_select tests example