Run CI against Django 3.2 and document support for it

SectorLabs · Nov 4, 2021 · 62ca95d · 62ca95d
1 parent 0426ba9
commit 62ca95d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -48,62 +48,59 @@ jobs:
     executor:
       name: python
       version: "3.6"
-
     steps:
       - checkout
       - install-dependencies:
           extra: test
       - run-tests:
           pyversion: 36
-          djversions: 20,21,22,30,31
+          djversions: 20,21,22,30,31,32
 
   test-python37:
     executor:
       name: python
       version: "3.7"
-
     steps:
       - checkout
       - install-dependencies:
           extra: test
       - run-tests:
           pyversion: 37
-          djversions: 20,21,22,30,31
+          djversions: 20,21,22,30,31,32
 
   test-python38:
     executor:
       name: python
       version: "3.8"
-
     steps:
       - checkout
       - install-dependencies:
           extra: test
       - run-tests:
           pyversion: 38
-          djversions: 20,21,22,30,31
+          djversions: 20,21,22,30,31,32
 
   test-python39:
     executor:
       name: python
       version: "3.9"
-
     steps:
       - checkout
       - install-dependencies:
           extra: test
       - run-tests:
           pyversion: 39
-          djversions: 21,22,30,31
+          djversions: 21,22,30,31,32
       - store_test_results:
           path: reports
       - run:
           name: Upload coverage report
           command: coveralls
 
   analysis:
-    docker:
-        - image: python:3.8-alpine
+    executor:
+      name: python
+      version: "3.9"
     steps:
       - checkout
       - install-dependencies:

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 | :memo: | **License** | [![License](https://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org) |
 | :package: | **PyPi** | [![PyPi](https://badge.fury.io/py/django-postgres-extra.svg)](https://pypi.python.org/pypi/django-postgres-extra) |
 | :four_leaf_clover: | **Code coverage** | [![Coverage Status](https://coveralls.io/repos/github/SectorLabs/django-postgres-extra/badge.svg?branch=coveralls)](https://coveralls.io/github/SectorLabs/django-postgres-extra?branch=master) |
-| <img src="https://icon-library.net/images/django-icon/django-icon-0.jpg" width="22px" height="22px" align="center" /> | **Django Versions** | 2.0, 2.1, 2.2, 3.0, 3.1 |
+| <img src="https://icon-library.net/images/django-icon/django-icon-0.jpg" width="22px" height="22px" align="center" /> | **Django Versions** | 2.0, 2.1, 2.2, 3.0, 3.1, 3.2 |
 | <img src="http://www.iconarchive.com/download/i73027/cornmanthe3rd/plex/Other-python.ico" width="22px" height="22px" align="center" /> | **Python Versions** | 3.6, 3.7, 3.8 |
 | :book: | **Documentation** | [Read The Docs](https://django-postgres-extra.readthedocs.io/en/master/) |
 | :warning: | **Upgrade** | [Upgrade from v1.x](https://django-postgres-extra.readthedocs.io/en/master/major_releases.html#new-features)
@@ -59,7 +59,7 @@ With seamless we mean that any features we add will work truly seamlessly. You s
 ### Prerequisites
 
 * PostgreSQL 10 or newer.
-* Django 2.0 or newer (including 3.0, 3.1).
+* Django 2.0 or newer (including 3.x).
 * Python 3.6 or newer.
 
 ### Getting started

diff --git a/docs/source/conflict_handling.rst b/docs/source/conflict_handling.rst
@@ -185,7 +185,7 @@ A row level lock is acquired before evaluating the condition and proceeding with
 
 When writing expressions, refer to the data you're trying to upsert with the :class:`psqlextra.expressions.ExcludedCol` expression.
 
-Alternatively, with Django 3.1, :class:`~django:django.db.models.Q` objects can be used instead:
+Alternatively, with Django 3.1 or newer, :class:`~django:django.db.models.Q` objects can be used instead:
 
 .. code-block:: python