From fd7c35c57f68270829895ba3aa91a04c60f7e7a1 Mon Sep 17 00:00:00 2001
From: John Whitlock <jwhitlock@mozilla.com>
Date: Fri, 21 Jun 2024 17:18:41 -0500
Subject: [PATCH 1/2] Update tox.ini for Django 3.2, pypy, gh

* Specify how to install Django 3.2. These tests are currently running
  against later Django versions.
* Add basepython entries for pypy. This fixes running tox locally.
* Fix the cpython version mapping in [gh-actions]. The github action
  tests for cpython versions are running against the latest Django,
  instead of the set of possible Django versions.
---
 tox.ini | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index a5b476c..7ee7f1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,10 +32,13 @@ basepython =
     3.10: python3.10
     3.11: python3.11
     3.12: python3.12
-    pypy3: pypy3
+    pypy38: pypy3.8
+    pypy39: pypy3.9
+    pypy310: pypy3.10
 
 deps =
     pytest
+    3.2.x: Django>=3.2,<3.3
     4.2.x: Django>=4.2,<4.3
     5.0.x: Django>=5.0.1,<5.1
     main: https://github.com/django/django/archive/main.tar.gz
@@ -45,11 +48,11 @@ deps =
 # Running tox in GHA without redefining it all in a GHA matrix:
 # https://github.com/ymyzk/tox-gh-actions
 python =
-    3.8: py38
-    3.9: py39
-    3.10: py310
-    3.11: py311
-    3.12: py312
+    3.8: 3.8
+    3.9: 3.9
+    3.10: 3.10
+    3.11: 3.11
+    3.12: 3.12
     pypy-3.8: pypy38
     pypy-3.9: pypy39
     pypy-3.10: pypy310

From fa9d5037818ab6d50611717a4eb789ac5b50add4 Mon Sep 17 00:00:00 2001
From: John Whitlock <jwhitlock@mozilla.com>
Date: Fri, 21 Jun 2024 17:46:15 -0500
Subject: [PATCH 2/2] Remove pypy from Django 3.2 testing

There are a few test failures with pypy and Django 3.2. Since 3.2 is out
of long-term support, drop these from the test matrix.
---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 7ee7f1d..fde744a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,12 +4,12 @@ envlist =
     {3.10,3.11,3.12,pypy310}-main
     {3.10,3.11,3.12,pypy310}-5.0.x
     {3.8,3.9,3.10,3.11,3.12,pypy38,pypy39,pypy310}-4.2.x
-    {3.8,3.9,3.10,pypy38,pypy39,pypy310}-3.2.x
+    {3.8,3.9,3.10}-3.2.x
 
 
 # Don't run coverage when testing with pypy:
 # see https://github.com/nedbat/coveragepy/issues/1382
-[testenv:pypy310-main,pypy310-5.0.x,{pypy38,pypy39,pypy310}-4.2.x,{pypy38,pypy39,pypy310}-3.2.x]
+[testenv:pypy310-main,pypy310-5.0.x,{pypy38,pypy39,pypy310}-4.2.x]
 commands =
     pip install --upgrade pip
     pip install -e .[tests]