diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-06-12 21:31:59 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 21:31:59 +1000 |
| commit | 09e9a26b7181e36af7e2a4a0795d68f962742738 (patch) | |
| tree | aaf5fb054d5f004a0bb67dd780f89dd2e5a2930f /synapse | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-09e9a26b7181e36af7e2a4a0795d68f962742738.tar.xz | |
Remove Python 2.7 support. (#5425)
* remove 2.7 from CI and publishing * fill out classifiers and also make it not be installed on 3.5 * some minor bumps so that the old deps work on python 3.5
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 7 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 5bc24863d9..0c01546789 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -17,6 +17,13 @@ """ This is a reference implementation of a Matrix home server. """ +import sys + +# Check that we're not running on an unsupported Python version. +if sys.version_info < (3, 5): + print("Synapse requires Python 3.5 or above.") + sys.exit(1) + try: from twisted.internet import protocol from twisted.internet.protocol import Factory diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7dfa78dadb..11ace2bfb1 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -44,7 +44,7 @@ REQUIREMENTS = [ "canonicaljson>=1.1.3", "signedjson>=1.0.0", "pynacl>=1.2.1", - "idna>=2", + "idna>=2.5", # validating SSL certs for IP addresses requires service_identity 18.1. "service_identity>=18.1.0", @@ -65,7 +65,7 @@ REQUIREMENTS = [ "sortedcontainers>=1.4.4", "psutil>=2.0.0", "pymacaroons>=0.13.0", - "msgpack>=0.5.0", + "msgpack>=0.5.2", "phonenumbers>=8.2.0", "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics |