From a50077219b873bdd7788fe17427b06b0935113e4 Mon Sep 17 00:00:00 2001
From: Agate Berriot <aberriot@entrouvert.com>
Date: Tue, 9 Aug 2022 15:35:00 +0200
Subject: [PATCH] Enabled django 3.2 testing in tox file (#68060)

---
 setup.py |  6 +++---
 tox.ini  | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index d2039c9..eba0f43 100644
--- a/setup.py
+++ b/setup.py
@@ -108,11 +108,11 @@ setup(
         'Programming Language :: Python',
     ],
     install_requires=[
-        'django>=2.2,<2.3',
+        'django>=2.2,<3.3',
         'gadjo',
         'django-ckeditor<4.5.4',
-        'django-haystack<2.8',
-        'django-taggit',
+        'django-haystack<3.2',
+        'django-taggit<3',
         'djangorestframework>=3.3,<3.13',
         'requests',
         'whoosh',
diff --git a/tox.ini b/tox.ini
index 90c8887..e105253 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-  py3-django22-black-coverage-pylint-drf39
-  py3-django22-black-coverage-pylint-drf312
+    py3-django22-drf39
+    py3-django32-black-coverage-pylint-drf312
 toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/welco/{env:BRANCH_NAME:}
 
 [testenv]
@@ -15,6 +15,8 @@ setenv =
   coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=welco/
 deps =
   django22: django>=2.2,<2.3
+  django32: django>=3.2,<3.3
+  django22: django-haystack<2.8
   pytest-cov
   pytest-django
   pytest!=5.3.3
@@ -29,9 +31,9 @@ deps =
   lxml
   git+https://git.entrouvert.org/debian/django-ckeditor.git
   black: pre-commit
-  drf39: djangorestframework>=3.9.2,<3.10
+  drf39: djangorestframework>=3.9,<3.10
   drf312: djangorestframework>=3.12,<3.13
 commands =
   pylint: ./pylint.sh welco/
-  py.test {env:COVERAGE:} {posargs:tests/}
+  py.test -p no:warnings {env:COVERAGE:} {posargs:tests/}
   black: pre-commit run black --all-files --show-diff-on-failure
-- 
2.36.1