Skip to content

Commit df8e689

Browse files
committed
Run CI against Django 3.2 and document support for it
1 parent c3cfae7 commit df8e689

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

.circleci/config.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,62 +48,59 @@ jobs:
4848
executor:
4949
name: python
5050
version: "3.6"
51-
5251
steps:
5352
- checkout
5453
- install-dependencies:
5554
extra: test
5655
- run-tests:
5756
pyversion: 36
58-
djversions: 20,21,22,30,31
57+
djversions: 20,21,22,30,31,32
5958

6059
test-python37:
6160
executor:
6261
name: python
6362
version: "3.7"
64-
6563
steps:
6664
- checkout
6765
- install-dependencies:
6866
extra: test
6967
- run-tests:
7068
pyversion: 37
71-
djversions: 20,21,22,30,31
69+
djversions: 20,21,22,30,31,32
7270

7371
test-python38:
7472
executor:
7573
name: python
7674
version: "3.8"
77-
7875
steps:
7976
- checkout
8077
- install-dependencies:
8178
extra: test
8279
- run-tests:
8380
pyversion: 38
84-
djversions: 20,21,22,30,31
81+
djversions: 20,21,22,30,31,32
8582

8683
test-python39:
8784
executor:
8885
name: python
8986
version: "3.9"
90-
9187
steps:
9288
- checkout
9389
- install-dependencies:
9490
extra: test
9591
- run-tests:
9692
pyversion: 39
97-
djversions: 21,22,30,31
93+
djversions: 21,22,30,31,32
9894
- store_test_results:
9995
path: reports
10096
- run:
10197
name: Upload coverage report
10298
command: coveralls
10399

104100
analysis:
105-
docker:
106-
- image: python:3.8-alpine
101+
executor:
102+
name: python
103+
version: "3.9"
107104
steps:
108105
- checkout
109106
- install-dependencies:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
| :memo: | **License** | [![License](https://img.shields.io/:license-mit-blue.svg)](http://doge.mit-license.org) |
99
| :package: | **PyPi** | [![PyPi](https://badge.fury.io/py/django-postgres-extra.svg)](https://pypi.python.org/pypi/django-postgres-extra) |
1010
| :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) |
11-
| <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 |
11+
| <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 |
1212
| <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 |
1313
| :book: | **Documentation** | [Read The Docs](https://django-postgres-extra.readthedocs.io/en/master/) |
1414
| :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
5959
### Prerequisites
6060

6161
* PostgreSQL 10 or newer.
62-
* Django 2.0 or newer (including 3.0, 3.1).
62+
* Django 2.0 or newer (including 3.x).
6363
* Python 3.6 or newer.
6464

6565
### Getting started

docs/source/conflict_handling.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ A row level lock is acquired before evaluating the condition and proceeding with
185185
186186
When writing expressions, refer to the data you're trying to upsert with the :class:`psqlextra.expressions.ExcludedCol` expression.
187187

188-
Alternatively, with Django 3.1, :class:`~django:django.db.models.Q` objects can be used instead:
188+
Alternatively, with Django 3.1 or newer, :class:`~django:django.db.models.Q` objects can be used instead:
189189

190190
.. code-block:: python
191191

0 commit comments

Comments
 (0)