Skip to content

Commit

Permalink
Include the requirements for [mypy,lint] in [dev] (matrix-org#11034)
Browse files Browse the repository at this point in the history
  • Loading branch information
reivilibre authored Oct 11, 2021
1 parent 3828dd8 commit 5e29d41
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ to install using pip and a virtualenv::

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

This will run a process of downloading and installing all the needed
dependencies into a virtual env. If any dependencies fail to install,
Expand Down
1 change: 1 addition & 0 deletions changelog.d/11034.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
When installing the optional developer dependencies, also include the dependencies needed for type-checking and unit testing.
2 changes: 1 addition & 1 deletion docs/development/contributing_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,lint,mypy,test]"
pip install -e ".[all,dev]"
pip install tox
```

Expand Down
23 changes: 14 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,6 @@ def exec_file(path_segments):
"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",
Expand All @@ -130,6 +121,20 @@ def exec_file(path_segments):
# 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,
Expand Down

0 comments on commit 5e29d41

Please sign in to comment.