From c2c7d16c4ac5094e7312537d16c7fe6bd82f2006 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sun, 19 Mar 2023 12:40:06 +0100
Subject: [PATCH] Prepare 3.1.0 release (confirmed Django 4.1 support)

---
 .github/workflows/test.yml | 7 +++----
 CHANGELOG.rst              | 6 ++++--
 setup.py                   | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5e0a333..6fef418 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,16 +42,15 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.7', '3.8', '3.9', '3.10']
-        django-version: ['2.2', '3.2', '4.0']
+        django-version: ['3.2', '4.0', '4.1']
         xapian-version: ['1.4.19']
         filelock-version: ['3.4.2']
         exclude:
-          # Django added python 3.10 support in 3.2.9
-          - python-version: '3.10'
-            django-version: '2.2'
           # Django dropped python 3.7 support in 4.0
           - python-version: '3.7'
             django-version: '4.0'
+          - python-version: '3.7'
+            django-version: '4.1'
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5ec1748..8568426 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,10 +2,12 @@
 xapian-haystack Changelog
 =========================
 
-Unreleased
-----------
+v3.1.0 (Unreleased)
+-------------------
 
 - Add DJANGO_CT, DJANGO_ID, ID to be used with '__exact' internally.
+- Ability to configure ngram min and max lengths.
+- Supported Django versions: 3.2, 4.0, 4.1
 - Dropped support for Python 3.6.
 - Fixed DatabaseLocked errors when running management commands with
   multiple workers.
diff --git a/setup.py b/setup.py
index 07f8944..e1d44e8 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ def read(fname):
 
 setup(
     name='xapian-haystack',
-    version='3.0.1',
+    version='3.1.0',
     description='A Xapian backend for Haystack',
     long_description=read('README.rst'),
     long_description_content_type='text/x-rst',
@@ -26,7 +26,7 @@ def read(fname):
     license='GPL2',
     py_modules=['xapian_backend'],
     install_requires=[
-        'django>=2.2',
+        'django>=3.2',
         'django-haystack>=2.8.0',
         'filelock>=3.4',
     ]