Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 5e29d41

Browse files
authored
Include the requirements for [mypy,lint] in [dev] (#11034)
1 parent 3828dd8 commit 5e29d41

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ to install using pip and a virtualenv::
298298

299299
python3 -m venv ./env
300300
source ./env/bin/activate
301-
pip install -e ".[all,test]"
301+
pip install -e ".[all,dev]"
302302

303303
This will run a process of downloading and installing all the needed
304304
dependencies into a virtual env. If any dependencies fail to install,

changelog.d/11034.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
When installing the optional developer dependencies, also include the dependencies needed for type-checking and unit testing.

docs/development/contributing_guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ setup a *virtualenv*, as follows:
5050
cd path/where/you/have/cloned/the/repository
5151
python3 -m venv ./env
5252
source ./env/bin/activate
53-
pip install -e ".[all,lint,mypy,test]"
53+
pip install -e ".[all,dev]"
5454
pip install tox
5555
```
5656

setup.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,6 @@ def exec_file(path_segments):
103103
"flake8",
104104
]
105105

106-
CONDITIONAL_REQUIREMENTS["dev"] = CONDITIONAL_REQUIREMENTS["lint"] + [
107-
# The following are used by the release script
108-
"click==7.1.2",
109-
"redbaron==0.9.2",
110-
"GitPython==3.1.14",
111-
"commonmark==0.9.1",
112-
"pygithub==1.55",
113-
]
114-
115106
CONDITIONAL_REQUIREMENTS["mypy"] = [
116107
"mypy==0.910",
117108
"mypy-zope==0.3.2",
@@ -130,6 +121,20 @@ def exec_file(path_segments):
130121
# parameterized_class decorator was introduced in parameterized 0.7.0
131122
CONDITIONAL_REQUIREMENTS["test"] = ["parameterized>=0.7.0"]
132123

124+
CONDITIONAL_REQUIREMENTS["dev"] = (
125+
CONDITIONAL_REQUIREMENTS["lint"]
126+
+ CONDITIONAL_REQUIREMENTS["mypy"]
127+
+ CONDITIONAL_REQUIREMENTS["test"]
128+
+ [
129+
# The following are used by the release script
130+
"click==7.1.2",
131+
"redbaron==0.9.2",
132+
"GitPython==3.1.14",
133+
"commonmark==0.9.1",
134+
"pygithub==1.55",
135+
]
136+
)
137+
133138
setup(
134139
name="matrix-synapse",
135140
version=version,

0 commit comments

Comments
 (0)