diff --git a/.travis.yml b/.travis.yml index 365f738826..bc87e5eeaf 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 + python: 3.8-dev - env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes python: 3.6 - env: TOXENV=py36-dj21-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes @@ -42,9 +42,7 @@ 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 - - env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes - python: 3.8 + python: 3.7 allow_failures: # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky - env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes @@ -54,11 +52,12 @@ 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/CHANGELOG.txt b/CHANGELOG.txt index cba02ef073..bcbbd39203 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,7 +6,6 @@ Changelog * Improved StreamField design (Bertrand Bordage) * Added Elasticsearch 7 support (pySilver) - * Added Python 3.8 support (John Carter, Matt Westcott) * Added `construct_page_listing_buttons` hook (Michael van Tellingen) * Added more detailed documentation and troubleshooting for installing OpenCV for feature detection (Daniele Procida) * Added Table Block caption for accessibility (Rahmi Pruitt) diff --git a/README.md b/README.md index b5939088b3..de9a2f7b9b 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, 3.7 and 3.8 +* Python 3.5, 3.6 and 3.7 * 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 d6677a4bcc..64e2844b88 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, 3.7 and 3.8. +Wagtail supports Python 3.5, 3.6, and 3.7. To check whether you have an appropriate version of Python 3: diff --git a/docs/releases/2.7.rst b/docs/releases/2.7.rst index 1b6a6d2de6..c74a64ff36 100644 --- a/docs/releases/2.7.rst +++ b/docs/releases/2.7.rst @@ -25,7 +25,6 @@ Other features ~~~~~~~~~~~~~~ * Added Elasticsearch 7 support (pySilver) - * Added Python 3.8 support (John Carter, Matt Westcott) * Added ``construct_page_listing_buttons`` hook (Michael van Tellingen) * Added more detailed documentation and troubleshooting for installing OpenCV for feature detection (Daniele Procida) * Move and refactor upgrade notification JS (Jonny Scholes) diff --git a/docs/releases/upgrading.rst b/docs/releases/upgrading.rst index 28155b551d..d22a688eb3 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, 3.8 | +| 2.7 LTS | 2.0, 2.1, 2.2 | 3.5, 3.6, 3.7 | +-------------------+------------------------------+-----------------------------+ diff --git a/setup.py b/setup.py index 0b407c4589..aca97457c9 100755 --- a/setup.py +++ b/setup.py @@ -97,7 +97,6 @@ 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',