Formalise Python 3.8 support

wethegit · Oct 15, 2019 · ddbbaea · ddbbaea
1 parent 34b3f0c
commit ddbbaea
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git 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/CHANGELOG.txt b/CHANGELOG.txt
@@ -6,6 +6,7 @@ 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
@@ -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
@@ -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/2.7.rst b/docs/releases/2.7.rst
@@ -25,6 +25,7 @@ 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
@@ -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
@@ -97,6 +97,7 @@
         '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',