From dac24f4df7dfc1d5f54bb4acb69ed079e9e9689e Mon Sep 17 00:00:00 2001
From: Mike <mike@zivix.com>
Date: Sat, 18 Dec 2021 20:17:20 -0800
Subject: [PATCH] Add Django 4.0 support (#138)

* chore: bump min python version to 3.7

* test: update test matrix versions

* doc: update changelog

* test: use strings for versions

* test: use major.minor for django version
---
 .github/workflows/test.yml | 14 ++++++++------
 CHANGELOG.md               |  3 +++
 pyproject.toml             |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 40a0bd0..8f78050 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,11 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        django-version:
-          - 'Django~=2.2.0'
-          - 'Django~=3.1.0'
-          - 'Django~=3.2.0'
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        django-version: ['2.2', '3.2', '4.0']
+        exclude:
+          - python-version: '3.10'
+            django-version: '2.2'
+          - python-version: '3.7'
+            django-version: '4.0'
 
     steps:
       - uses: actions/checkout@v2
@@ -38,7 +40,7 @@ jobs:
         run: |
           poetry install
           poetry run pip install -U pip
-          poetry run pip install -U "${{ matrix.django-version }}"
+          poetry run pip install -U "django==${{ matrix.django-version }}.*"
 
       - name: Run tests
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b555e6..0f947b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,14 @@ We follow [Semantic Versions](https://semver.org/) starting at the `0.14.0` rele
 ### Features
 
 - Adds 64-bit support for `Value.value_int`
+- Adds Django 4.0 and Python 3.10 support
 
 ### Bug Fixes
 
 ### Misc
 
+- Drops support for Django 3.1 and Python 3.6
+
 ## 1.1.0 (2021-11-07)
 
 ### Features
diff --git a/pyproject.toml b/pyproject.toml
index e174a37..e1f8465 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,7 +55,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.6.2"
+python = "^3.7"
 django-jsonfield-backport = "^1.0.4"
 
 [tool.poetry.dev-dependencies]