summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-12-20 13:57:48 +0000
committerRichard van der Hoff <richard@matrix.org>2018-12-20 13:57:48 +0000
commitdfeb274484323403cfac8c9bc7026130a298f30e (patch)
treed05125ce2324f8e0d2a486865e32b9a5b2fa9d49
parentmore changelog fix (diff)
downloadsynapse-dfeb274484323403cfac8c9bc7026130a298f30e.tar.xz
document supported python 3 versions
-rw-r--r--CHANGES.md9
-rw-r--r--UPGRADE.rst5
2 files changed, 9 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md
index f1332edf94..727275fa33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,12 @@
 Synapse 0.34.0 (2018-12-20)
 ===========================
 
-Synapse 0.34.0 is the first release to fully support Python 3. We recommend
-upgrading to Python 3, but make sure to read the
-[upgrade notes](UPGRADE.rst#upgrading-to-v0340) when doing so.
+Synapse 0.34.0 is the first release to fully support Python 3. Synapse will now
+run on Python versions 3.5 or 3.6 (as well as 2.7). Support for Python 3.7
+remains experimental.
+
+We recommend upgrading to Python 3, but make sure to read the [upgrade
+notes](UPGRADE.rst#upgrading-to-v0340) when doing so.
 
 Features
 --------
diff --git a/UPGRADE.rst b/UPGRADE.rst
index b8dead480a..b214a15526 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -51,8 +51,9 @@ returned by the Client-Server API:
 Upgrading to v0.34.0
 ====================
 
-1. This release is the first to fully support Python 3. We recommend switching
-   to Python 3, as it has been shown to give performance improvements.
+1. This release is the first to fully support Python 3. Synapse will now run on
+   Python versions 3.5, or 3.6 (as well as 2.7). We recommend switching to
+   Python 3, as it has been shown to give performance improvements.
 
    For users who have installed Synapse into a virtualenv, we recommend doing
    this by creating a new virtualenv. For example::