Update github workflow, README, CHANGELOG

.github/workflows/package.yml

@@ -27,8 +27,13 @@ jobs:
           - 5432:5432
     strategy:
       matrix:
+<<<<<<< Updated upstream
         python-version: ['3.9', '3.10', '3.11', '3.12']
         django-series: ['3.2', '4.0', '4.2']
+=======
+        python-version: ['3.7', '3.8', '3.12']
+        django-series: ['4.2', '5.1']
+>>>>>>> Stashed changes
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

CHANGELOG.md

@@ -9,6 +9,10 @@
 
 * Add a --sync flag to the loaddivisions management command, to delete divisions that are in the DB but not the CSV, even if the DB contains the CSV. This flag is relevant if you synchronize with a single CSV.
 
+## 3.4.0 (put the date here, I guess)
+
+* Support Django versions >=4.2
+
 ## 3.3.0 (2023-05-08)
 
 * Add last_seen field to database objects

README.md

@@ -8,7 +8,7 @@ python-opencivicdata
 Python utilities (including Django models) for implementing the
 Open Civic Data specification.
 
-**Requires Django >=2.2 and Python >= 3.6, pin to <3.0 for older versions**
+**Requires Django >=4.2 and Python >= 3.6, pin to <3.0 for Django versions < 2.2 and < 3.3 for Django versions < 4.2 **
 
 The Organization, Person, Membership, Post, and VoteEvent models and related models are based on the [Popolo specification](http://popoloproject.com/).
 

opencivicdata/core/models/base.py

@@ -2,7 +2,10 @@
 import re
 import uuid
 from django.db import models
+<<<<<<< Updated upstream
 
+=======
+>>>>>>> Stashed changes
 from django.contrib.postgres.fields import ArrayField
 from django.core.validators import RegexValidator