Merge branch 'master' into develop

; Conflicts: ; README.rst ; tox.ini
modlinltd · Jan 23, 2022 · 5549cdf · 5549cdf
2 parents da6fe7f + a102f5c
commit 5549cdf
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,35 @@
 Changelog
 =========
 
+1.3.0 - Django 3.1 and more
+---------------------------
+
+Apologies for the late release, and thanks to everyone that contributed.
+
+Bug fixes
+~~~~~~~~~
+
+- Add support for python 3.9 and django 3.1
+- import FieldDoesNotExist from django.core.exceptions
+
+Misc
+~~~~
+
+- Update django-braces
+- Update Admin to show model
+- Add Turkish translation
+- Correct travis.yml deprecated/dupe keywords
+
+Contributors
+~~~~~~~~~~~~
+
+- Pavel Savchenko
+- predatell
+- Özcan YARIMDÜNYA
+- Thu Trang Pham
+- João Batista
+
+
 1.2.0 - Django 3 and more
 -------------------------
 

diff --git a/README.rst b/README.rst
@@ -26,7 +26,7 @@ For release notes, see `Changelog <https://raw.githubusercontent.com/modlinltd/d
 Requirements
 ============
 
--  Django >= 1.9 (Django 1.9 - 3.0 on Python 2/3/PyPy3)
+-  Django >= 1.9 (Django 1.9 - 3.1 on Python 2/3/PyPy3)
 -  simplejson >= 3.6.5, < 4
 
 

diff --git a/advanced_filters/__init__.py b/advanced_filters/__init__.py
@@ -1 +1 @@
-__version__ = '1.2.0'
+__version__ = '1.3.0'
diff --git a/setup.py b/setup.py
@@ -84,6 +84,7 @@ def get_full_description():
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Framework :: Django',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',