From 69e96a9227a7ee952b00434c6e84bedd2cf4c631 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 15 Oct 2019 16:30:58 +0100 Subject: [PATCH] Formalise Python 3.8 support --- .travis.yml | 9 +++++---- README.md | 2 +- docs/getting_started/tutorial.rst | 2 +- docs/releases/upgrading.rst | 2 +- setup.py | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc87e5eeaf..365f738826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: - env: TOXENV=py37-djmaster-postgres-noelasticsearch python: 3.7 - env: TOXENV=py38-dj22-postgres-noelasticsearch - python: 3.8-dev + python: 3.8 - env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes python: 3.6 - env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes @@ -42,7 +42,9 @@ matrix: - env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes python: 3.7 - env: TOXENV=py37-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes - python: 3.7 + python: 3.7 + - env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes + python: 3.8 allow_failures: # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky - env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes @@ -52,12 +54,11 @@ matrix: - env: TOXENV=py36-dj21-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes - env: TOXENV=py37-dj22-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes - env: TOXENV=py37-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes + - env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes # allow failures against Django 2.2.x stable branch - env: TOXENV=py37-dj22stable-postgres-noelasticsearch # allow failures against Django master - env: TOXENV=py37-djmaster-postgres-noelasticsearch - # allow failures against Python 3.8-dev - - env: TOXENV=py38-dj22-postgres-noelasticsearch # Services services: diff --git a/README.md b/README.md index de9a2f7b9b..b5939088b3 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Wagtail is used by NASA, Google, Oxfam, the NHS, Mozilla, MIT, the Red Cross, Sa Wagtail supports: * Django 2.0.x, 2.1.x and 2.2.x -* Python 3.5, 3.6 and 3.7 +* Python 3.5, 3.6, 3.7 and 3.8 * PostgreSQL, MySQL and SQLite as database backends Previous versions of Wagtail (1.13 and earlier) additionally supported Python 2.7 and Django 1.x. diff --git a/docs/getting_started/tutorial.rst b/docs/getting_started/tutorial.rst index 64e2844b88..d6677a4bcc 100644 --- a/docs/getting_started/tutorial.rst +++ b/docs/getting_started/tutorial.rst @@ -11,7 +11,7 @@ Install and run Wagtail Install dependencies ~~~~~~~~~~~~~~~~~~~~ -Wagtail supports Python 3.5, 3.6, and 3.7. +Wagtail supports Python 3.5, 3.6, 3.7 and 3.8. To check whether you have an appropriate version of Python 3: diff --git a/docs/releases/upgrading.rst b/docs/releases/upgrading.rst index d22a688eb3..28155b551d 100644 --- a/docs/releases/upgrading.rst +++ b/docs/releases/upgrading.rst @@ -129,6 +129,6 @@ The compatible versions of Django and Python for each Wagtail release are: +-------------------+------------------------------+-----------------------------+ | 2.6 | 2.0, 2.1, 2.2 | 3.5, 3.6, 3.7 | +-------------------+------------------------------+-----------------------------+ -| 2.7 LTS | 2.0, 2.1, 2.2 | 3.5, 3.6, 3.7 | +| 2.7 LTS | 2.0, 2.1, 2.2 | 3.5, 3.6, 3.7, 3.8 | +-------------------+------------------------------+-----------------------------+ diff --git a/setup.py b/setup.py index aca97457c9..0b407c4589 100755 --- a/setup.py +++ b/setup.py @@ -97,6 +97,7 @@ https://github.com/wagtail/wagtail/.", 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Framework :: Django', 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1',