summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2021-10-08 17:15:32 +0100
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2021-10-08 17:17:22 +0100
commit593eeac19ea8ecc1344933f91fb4fc18a8a97221 (patch)
tree23b1f1e5aebd931ce9e3faba8e8f301d1f079595 /setup.py
parentNewsfile (diff)
downloadsynapse-593eeac19ea8ecc1344933f91fb4fc18a8a97221.tar.xz
Revert accidental push to develop.
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py23
1 files changed, 9 insertions, 14 deletions
diff --git a/setup.py b/setup.py

index 220084a49d..f8b4487bc1 100755 --- a/setup.py +++ b/setup.py
@@ -103,6 +103,15 @@ CONDITIONAL_REQUIREMENTS["lint"] = [ "flake8", ] +CONDITIONAL_REQUIREMENTS["dev"] = CONDITIONAL_REQUIREMENTS["lint"] + [ + # The following are used by the release script + "click==7.1.2", + "redbaron==0.9.2", + "GitPython==3.1.14", + "commonmark==0.9.1", + "pygithub==1.55", +] + CONDITIONAL_REQUIREMENTS["mypy"] = [ "mypy==0.910", "mypy-zope==0.3.2", @@ -121,20 +130,6 @@ CONDITIONAL_REQUIREMENTS["mypy"] = [ # parameterized_class decorator was introduced in parameterized 0.7.0 CONDITIONAL_REQUIREMENTS["test"] = ["parameterized>=0.7.0"] -CONDITIONAL_REQUIREMENTS["dev"] = ( - CONDITIONAL_REQUIREMENTS["lint"] - + CONDITIONAL_REQUIREMENTS["mypy"] - + CONDITIONAL_REQUIREMENTS["test"] - + [ - # The following are used by the release script - "click==7.1.2", - "redbaron==0.9.2", - "GitPython==3.1.14", - "commonmark==0.9.1", - "pygithub==1.55", - ] -) - setup( name="matrix-synapse", version=version,