Formalise support for Django 3.2

Fixes #6981
pull/7033/head
Matt Westcott 2021-04-08 16:56:51 +01:00
rodzic deeb771032
commit 8f5a2a8fe9
7 zmienionych plików z 24 dodań i 13 usunięć

Wyświetl plik

@ -20,16 +20,18 @@ on:
# - django 2.2, python 3.6, mysql
# - django 3.0, python 3.7, sqlite
# - django 3.1, python 3.8, postgres
# - django 3.1, python 3.9, mysql
# - django 3.1, python 3.9, sqlite
# - django 3.1, python 3.9, postgres, USE_EMAIL_USER_MODEL=yes
# - django 3.1, python 3.9, postgres, DISABLE_TIMEZONE=yes
# - django 3.2, python 3.8, postgres
# - django 3.2, python 3.9, mysql
# - django 3.2, python 3.9, sqlite
# - django 3.2, python 3.9, postgres, USE_EMAIL_USER_MODEL=yes
# - django 3.2, python 3.9, postgres, DISABLE_TIMEZONE=yes
# - django stable/3.2.x, python 3.9, postgres (allow failures)
# - django main, python 3.9, postgres (allow failures)
# - elasticsearch 5, django 2.2, python 3.6, sqlite
# - elasticsearch 6, django 3.0, python 3.7, postgres
# - elasticsearch 7, django 3.1, python 3.8, postgres
# - elasticsearch 7, django 3.1, python 3.9, sqlite, USE_EMAIL_USER_MODEL=yes
# - elasticsearch 7, django 3.2, python 3.8, postgres
# - elasticsearch 7, django 3.2, python 3.9, sqlite, USE_EMAIL_USER_MODEL=yes
jobs:
test-sqlite:
@ -68,12 +70,15 @@ jobs:
- python: 3.8
django: "Django>=3.1,<3.2"
experimental: false
- python: 3.8
django: "Django>=3.2,<3.3"
experimental: false
- python: 3.9
django: "Django>=3.1,<3.2"
django: "Django>=3.2,<3.3"
emailuser: emailuser
experimental: false
- python: 3.9
django: "Django>=3.1,<3.2"
django: "Django>=3.2,<3.3"
notz: notz
experimental: false
- python: 3.9
@ -121,7 +126,7 @@ jobs:
- python: 3.6
django: "Django>=2.2,<3.0"
- python: 3.9
django: "Django>=3.1,<3.2"
django: "Django>=3.2,<3.3"
services:
mysql:
@ -201,7 +206,7 @@ jobs:
matrix:
include:
- python: 3.9
django: "Django>=3.1,<3.2"
django: "Django>=3.2,<3.3"
emailuser: emailuser
steps:
- name: Configure sysctl limits
@ -294,6 +299,9 @@ jobs:
include:
- python: 3.8
django: "Django>=3.1,<3.2"
include:
- python: 3.8
django: "Django>=3.2,<3.3"
services:
postgres:

Wyświetl plik

@ -6,6 +6,7 @@ Changelog
* New StreamField implementation with performance and functionality improvements (Matt Westcott, Karl Hobley)
* Added a simple translation module into `wagtail.contrib.simple_translation` (Coen van der Kamp)
* Add support for Django 3.2
* Support passing `min_num`, `max_num` and `block_counts` arguments directly to `StreamField` (Haydn Greatnews, Matt Westcott)
* Add the option to set rich text images as decorative, without alt text (Helen Chapman, Thibaud Colas)
* Add support for `__year` lookup in Elasticsearch queries (Seb Brown)

Wyświetl plik

@ -56,7 +56,7 @@ _(If you are reading this on GitHub, the details here may not be indicative of t
Wagtail supports:
* Django 2.2.x, 3.0.x and 3.1.x
* Django 2.2.x, 3.0.x, 3.1.x and 3.2.x
* Python 3.6, 3.7, 3.8 and 3.9
* PostgreSQL, MySQL and SQLite as database backends

Wyświetl plik

@ -5,7 +5,7 @@
Wagtail provides the `wagtail start` command and project template to get you started with a new Wagtail project as quickly as possible, but it's easy to integrate Wagtail into an existing Django project too.
Wagtail is currently compatible with Django 2.2, 3.0 and 3.1. First, install the `wagtail` package from PyPI:
Wagtail is currently compatible with Django 2.2, 3.0, 3.1 and 3.2. First, install the `wagtail` package from PyPI:
```sh
$ pip install wagtail

Wyświetl plik

@ -29,6 +29,7 @@ This module was contributed by Coen van der Kamp.
Other features
~~~~~~~~~~~~~~
* Add support for Django 3.2
* Support passing ``min_num``, ``max_num`` and ``block_counts`` arguments directly to ``StreamField`` (Haydn Greatnews, Matt Westcott)
* Add the option to set rich text images as decorative, without alt text (Helen Chapman, Thibaud Colas)
* Add support for ``__year`` filter in Elasticsearch queries (Seb Brown)

Wyświetl plik

@ -141,5 +141,5 @@ The compatible versions of Django and Python for each Wagtail release are:
+-------------------+------------------------------+-----------------------------+
| 2.12 | 2.2, 3.0, 3.1 | 3.6, 3.7, 3.8, 3.9 |
+-------------------+------------------------------+-----------------------------+
| 2.13 | 2.2, 3.0, 3.1 | 3.6, 3.7, 3.8, 3.9 |
| 2.13 | 2.2, 3.0, 3.1, 3.2 | 3.6, 3.7, 3.8, 3.9 |
+-------------------+------------------------------+-----------------------------+

Wyświetl plik

@ -20,7 +20,7 @@ except ImportError:
install_requires = [
"Django>=2.2,<3.2",
"Django>=2.2,<3.3",
"django-modelcluster>=5.1,<6.0",
"django-taggit>=1.0,<2.0",
"django-treebeard>=4.2.0,<5.0,!=4.5",
@ -112,6 +112,7 @@ https://github.com/wagtail/wagtail/.",
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Framework :: Wagtail',
'Topic :: Internet :: WWW/HTTP :: Site Management',
],