Merge branch 'master' into develop

CHANGELOG.rst

@@ -1,6 +1,61 @@
 Changelog
 =========
 
+1.2.0 - Django 3 and more
+-------------------------
+
+It's finally time to drop the dirty old rags and don some fresh colors.
+
+Thanks to effort from multiple contributors, this version includes support
+for newest Django version.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+* Add support for Django 2.2 and 3.0
+* Drop support for Django < 1.9
+* Drop support for Python 3.3-3.4
+
+*django-advanced-filters now support only* **python 2.7, and 3.5 - 3.8.**
+
+Features
+~~~~~~~~
+
+- Switch deprecated force_text to force_str (Merge 0427d11)
+
+Bug fixes
+~~~~~~~~~
+
+- Avoid installing newer braces (Merge 0427d11)
+- Allow choices sort on None fields (Merge 142ecd0)
+
+Docs / Tests
+~~~~~~~~~~~~
+
+- Update dependencies stated in the README
+- Refactor some unittest test cases into pytest (Merge 41271b7)
+- Test the CleanWhiteSpacesMixin helper
+
+Misc
+~~~~
+
+- Update requirements for new test deps matrix (Merge 0427d11)
+- Replace deprecated assertEquals (Merge 41271b7)
+- Replace deprecated logger.warn with warning (Merge 41271b7)
+- Bump test dependencies (Merge 41271b7)
+- Update python and add Django classifiers
+
+
+Contributors
+~~~~~~~~~~~~
+
+- Petr Dlouhý
+- Alon Raizman
+- Hugo Maingonnat
+- Arpit
+- Pavel Savchenko
+
+
 1.1.1 - CHANGELOG rendering is hard
 -----------------------------------
 

CONTRIBUTING.rst

@@ -26,10 +26,10 @@ Pull Request Process
    other developer, or if you do not have permission to do that, you may
    request the reviewer to merge it for you.
 
-Release process
----------------
+Manual Release process
+----------------------
 
-1. Prepeare the changelog and amend the CHANGELOG.rst
+1. Prepare the changelog and amend the CHANGELOG.rst
 2. Increase the version numbers in any examples files and the README.rst
    to the new version that this Pull Request would represent. The
    versioning scheme we use is `SemVer <http://semver.org/>`__.

advanced_filters/__init__.py

@@ -1 +1 @@
-__version__ = '1.1.1'
+__version__ = '1.2.0'

advanced_filters/tests/test_helpers.py

@@ -0,0 +1,17 @@
+from ..form_helpers import CleanWhiteSpacesMixin
+
+import django.forms
+
+
+class FormToTest(CleanWhiteSpacesMixin, django.forms.Form):
+    some_field = django.forms.CharField()
+
+
+def test_spaces_removed():
+    form = FormToTest(data={'some_field': ' a   weird value  '})
+    assert form.is_valid()
+    assert form.cleaned_data == {'some_field': 'a weird value'}
+
+    form = FormToTest(data={'some_field': ' \n\r \n  '})
+    assert not form.is_valid()
+    assert form.cleaned_data == {}