diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-04-27 13:13:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 13:13:07 +0100 |
| commit | fe604a022a7142157da7e90a40330beb2a11af7a (patch) | |
| tree | d0e20b355e5e9b532665651daa52eb096310baa4 /tox.ini | |
| parent | Pass errors back to the client when trying multiple federation destinations. ... (diff) | |
| download | synapse-fe604a022a7142157da7e90a40330beb2a11af7a.tar.xz | |
Remove various bits of compatibility code for Python <3.6 (#9879)
I went through and removed a bunch of cruft that was lying around for compatibility with old Python versions. This PR also will now prevent Synapse from starting unless you're running Python 3.6+.
Diffstat (limited to '')
| -rw-r--r-- | tox.ini | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini index 998b04b224..ecd609271d 100644 --- a/tox.ini +++ b/tox.ini @@ -21,13 +21,11 @@ deps = # installed on that). # # anyway, make sure that we have a recent enough setuptools. - setuptools>=18.5 ; python_version >= '3.6' - setuptools>=18.5,<51.0.0 ; python_version < '3.6' + setuptools>=18.5 # we also need a semi-recent version of pip, because old ones fail to # install the "enum34" dependency of cryptography. - pip>=10 ; python_version >= '3.6' - pip>=10,<21.0 ; python_version < '3.6' + pip>=10 # directories/files we run the linters on. # if you update this list, make sure to do the same in scripts-dev/lint.sh @@ -168,8 +166,7 @@ skip_install = true usedevelop = false deps = coverage - pip>=10 ; python_version >= '3.6' - pip>=10,<21.0 ; python_version < '3.6' + pip>=10 commands= coverage combine coverage report |