From 797ee7812db28f6cf130d68e2d10911c826b0be5 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Fri, 8 Oct 2021 14:49:41 +0100 Subject: Relax `ignore-missing-imports` for modules that have stubs now and update mypy (#11006) Updating mypy past version 0.9 means that third-party stubs are no-longer distributed with typeshed. See http://mypy-lang.blogspot.com/2021/06/mypy-0900-released.html for details. We therefore pull in stub packages in setup.py Additionally, some modules that we were previously ignoring import failures for now have stubs. So let's use them. The rest of this change consists of fixups to make the newer mypy + stubs pass CI. Co-authored-by: Patrick Cloke --- setup.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c478563510..f8b4487bc1 100755 --- a/setup.py +++ b/setup.py @@ -112,7 +112,16 @@ CONDITIONAL_REQUIREMENTS["dev"] = CONDITIONAL_REQUIREMENTS["lint"] + [ "pygithub==1.55", ] -CONDITIONAL_REQUIREMENTS["mypy"] = ["mypy==0.812", "mypy-zope==0.2.13"] +CONDITIONAL_REQUIREMENTS["mypy"] = [ + "mypy==0.910", + "mypy-zope==0.3.2", + "types-bleach>=4.1.0", + "types-jsonschema>=3.2.0", + "types-Pillow>=8.3.4", + "types-pyOpenSSL>=20.0.7", + "types-PyYAML>=5.4.10", + "types-setuptools>=57.4.0", +] # Dependencies which are exclusively required by unit test code. This is # NOT a list of all modules that are necessary to run the unit tests. -- cgit 1.5.1 From c576598a6834c59e7e6e51eb72c2967b00762666 Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Fri, 8 Oct 2021 17:11:14 +0100 Subject: Include the requirements for [mypy,lint] in [dev] --- setup.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f8b4487bc1..220084a49d 100755 --- a/setup.py +++ b/setup.py @@ -103,15 +103,6 @@ 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", @@ -130,6 +121,20 @@ 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, -- cgit 1.5.1 From 593eeac19ea8ecc1344933f91fb4fc18a8a97221 Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Fri, 8 Oct 2021 17:15:32 +0100 Subject: Revert accidental push to develop. --- changelog.d/11034.misc | 1 - docs/development/contributing_guide.md | 2 +- setup.py | 23 +++++++++-------------- 3 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 changelog.d/11034.misc (limited to 'setup.py') 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, -- cgit 1.5.1 From 5e29d417fc5933e26ba85a40c298d46b09580330 Mon Sep 17 00:00:00 2001 From: reivilibre Date: Mon, 11 Oct 2021 16:34:31 +0100 Subject: Include the requirements for [mypy,lint] in [dev] (#11034) --- README.rst | 2 +- changelog.d/11034.misc | 1 + docs/development/contributing_guide.md | 2 +- setup.py | 23 ++++++++++++++--------- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 changelog.d/11034.misc (limited to 'setup.py') diff --git a/README.rst b/README.rst index 63deb06eac..50de3a49b0 100644 --- a/README.rst +++ b/README.rst @@ -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, diff --git a/changelog.d/11034.misc b/changelog.d/11034.misc new file mode 100644 index 0000000000..b15fd66ac3 --- /dev/null +++ b/changelog.d/11034.misc @@ -0,0 +1 @@ +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 580a4f7f98..3bf08a72bb 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,lint,mypy,test]" +pip install -e ".[all,dev]" pip install tox ``` diff --git a/setup.py b/setup.py index f8b4487bc1..220084a49d 100755 --- a/setup.py +++ b/setup.py @@ -103,15 +103,6 @@ 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", @@ -130,6 +121,20 @@ 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, -- cgit 1.5.1