Skip to content

Commit 2e25603

Browse files
committed
Merge remote-tracking branch 'origin/2.0' into 2.0
* origin/2.0: Django 3.2 final Add note on Django version support
2 parents 908823c + 31e0e00 commit 2e25603

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Diff for: .github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
python: [3.6, 3.7, 3.8, 3.9]
13-
django: [3.1, 3.2rc1]
13+
django: [3.1, 3.2]
1414
database_url:
1515
- postgres://runner:password@localhost/project
1616
- mysql://root:[email protected]/project

Diff for: README.md

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ DELETE FROM django_migrations WHERE app='django_dbq';
3636

3737
Then, run `python manage.py migrate` to recreate the jobs table.
3838

39+
Note that version 2.x only supports Django 3.1 or newer. If you need support for Django 2.2, please stick with the latest 1.x release.
40+
3941
### Describe your job
4042

4143
In e.g. project.common.jobs:

0 commit comments

Comments
 (0)