Merge branch 'release/1.7.1'

Author: crucialfelix

.travis.yml

@@ -2,17 +2,20 @@ language: python
 sudo: false
 env:
   - TOX_ENV=py27-flake8
-  - TOX_ENV=py34-flake8
+  - TOX_ENV=py36-flake8
   - TOX_ENV=py27-dj18
   - TOX_ENV=py27-dj19
   - TOX_ENV=py27-dj110
   - TOX_ENV=py27-dj111
-  - TOX_ENV=py34-dj18
-  - TOX_ENV=py34-dj19
-  - TOX_ENV=py34-dj110
-  - TOX_ENV=py34-dj111
-  - TOX_ENV=py34-dj20
+  - TOX_ENV=py36-dj18
+  - TOX_ENV=py36-dj19
+  - TOX_ENV=py36-dj110
+  - TOX_ENV=py36-dj111
+  - TOX_ENV=py36-dj20
+  - TOX_ENV=py36-dj21
+before_install:
+  - pyenv global system 3.6
 install:
- - pip install -r requirements-test.txt
+  - pip install -r requirements-test.txt
 script:
   - tox -e $TOX_ENV

README.md

@@ -47,6 +47,17 @@ class DocumentForm(ModelForm):
     tags = AutoCompleteSelectMultipleField('tags')
 ```
 
+This will now work in the Django Admin.
+
+To use a form outside, be sure to include `form.media` on the template where you place the form:
+
+```html
+{{ form.media }}
+{{ form }}
+```
+
+Read the full documention here: [outside of the admin](http://django-ajax-selects.readthedocs.io/en/latest/Outside-of-Admin.html)
+
 ## Fully customizable
 
 * Customize search query

ajax_select/fields.py

@@ -70,7 +70,7 @@ def __init__(self,
         self.help_text = help_text
         self.show_help_text = show_help_text
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None, **_kwargs):
         value = value or ''
 
         final_attrs = self.build_attrs(self.attrs)
@@ -194,7 +194,7 @@ def __init__(self,
         self.show_help_text = show_help_text
         self.plugin_options = plugin_options or {}
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None, **_kwargs):
 
         if value is None:
             value = []
@@ -352,7 +352,7 @@ def __init__(self, channel, *args, **kwargs):
 
         super(AutoCompleteWidget, self).__init__(*args, **kwargs)
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None, **_kwargs):
 
         initial = value or ''
         final_attrs = self.build_attrs(self.attrs)

requirements-test.txt

@@ -1,6 +1,6 @@
 coverage>=4.4.1
 coveralls>=1.1
 flake8>=3.3.0
-tox>=2.7.0
+tox>=2.8.0
 sphinx>=1.6.1
 sphinx_rtd_theme

requirements.txt

@@ -1,2 +1,2 @@
-django>=1.8, <2.1
+django>=1.8, <2.2
 wheel==0.29.0

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='django-ajax-selects',
-    version='1.7.0',
+    version='1.7.1',
     description='Edit ForeignKey, ManyToManyField and CharField in Django Admin using jQuery UI AutoComplete.',
     author='Chris Sattinger',
     author_email='[email protected]',

tox.ini

@@ -6,9 +6,9 @@
 ;
 [tox]
 envlist =
-  {py27,py34}-flake8,
-  {py27,py34}-{dj18,dj19,dj110,dj111}
-  {py34}-{dj20}
+  {py27,py36}-flake8,
+  {py27,py36}-{dj18,dj19,dj110,dj111}
+  py36-{dj20,dj21}
 
 [testenv]
 setenv =
@@ -21,29 +21,16 @@ deps =
   dj110: Django>=1.10.8,<1.11
   dj111: Django>=1.11.8,<1.12
   dj20: Django>=2.0,<2.1
+  dj21: Django>=2.1,<2.2
   ; djmaster: https://github.com/django/django/zipball/master
 
 [testenv:py27-flake8]
 deps =
   flake8
 commands = flake8 ajax_select tests example
 
-[testenv:py34-flake8]
+[testenv:py36-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