diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2021-10-08 17:15:32 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2021-10-08 17:17:22 +0100 |
| commit | 593eeac19ea8ecc1344933f91fb4fc18a8a97221 (patch) | |
| tree | 23b1f1e5aebd931ce9e3faba8e8f301d1f079595 | |
| parent | Newsfile (diff) | |
| download | synapse-593eeac19ea8ecc1344933f91fb4fc18a8a97221.tar.xz | |
Revert accidental push to develop.
| -rw-r--r-- | changelog.d/11034.misc | 1 | ||||
| -rw-r--r-- | docs/development/contributing_guide.md | 2 | ||||
| -rwxr-xr-x | setup.py | 23 |
3 files changed, 10 insertions, 16 deletions
diff --git a/changelog.d/11034.misc b/changelog.d/11034.misc deleted file mode 100644 index b15fd66ac3..0000000000 --- a/changelog.d/11034.misc +++ /dev/null @@ -1 +0,0 @@ -When installing the optional developer dependencies, also include the dependencies needed for type-checking and unit testing. diff --git a/docs/development/contributing_guide.md b/docs/development/contributing_guide.md index 3bf08a72bb..580a4f7f98 100644 --- a/docs/development/contributing_guide.md +++ b/docs/development/contributing_guide.md @@ -50,7 +50,7 @@ setup a *virtualenv*, as follows: cd path/where/you/have/cloned/the/repository python3 -m venv ./env source ./env/bin/activate -pip install -e ".[all,dev]" +pip install -e ".[all,lint,mypy,test]" pip install tox ``` 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, |