diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-10-02 05:29:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 05:29:01 -0700 |
| commit | 864f14454322c6cba11476667ade8fc6cbea6f44 (patch) | |
| tree | c50252079f4cdf0ac2fc9c1193176590ed64e6ab /synapse/python_dependencies.py | |
| parent | Fix yields and copy instead of move push rules on room upgrade (#6144) (diff) | |
| download | synapse-864f14454322c6cba11476667ade8fc6cbea6f44.tar.xz | |
Fix up some typechecking (#6150)
* type checking fixes * changelog
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 0bd563edc7..aa7da1c543 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -15,7 +15,7 @@ # limitations under the License. import logging -from typing import Set +from typing import List, Set from pkg_resources import ( DistributionNotFound, @@ -73,6 +73,7 @@ REQUIREMENTS = [ "netaddr>=0.7.18", "Jinja2>=2.9", "bleach>=1.4.3", + "typing-extensions>=3.7.4", ] CONDITIONAL_REQUIREMENTS = { @@ -144,7 +145,11 @@ def check_requirements(for_feature=None): deps_needed.append(dependency) errors.append( "Needed %s, got %s==%s" - % (dependency, e.dist.project_name, e.dist.version) + % ( + dependency, + e.dist.project_name, # type: ignore[attr-defined] # noqa + e.dist.version, # type: ignore[attr-defined] # noqa + ) ) except DistributionNotFound: deps_needed.append(dependency) @@ -159,7 +164,7 @@ def check_requirements(for_feature=None): if not for_feature: # Check the optional dependencies are up to date. We allow them to not be # installed. - OPTS = sum(CONDITIONAL_REQUIREMENTS.values(), []) + OPTS = sum(CONDITIONAL_REQUIREMENTS.values(), []) # type: List[str] for dependency in OPTS: try: @@ -168,7 +173,11 @@ def check_requirements(for_feature=None): deps_needed.append(dependency) errors.append( "Needed optional %s, got %s==%s" - % (dependency, e.dist.project_name, e.dist.version) + % ( + dependency, + e.dist.project_name, # type: ignore[attr-defined] # noqa + e.dist.version, # type: ignore[attr-defined] # noqa + ) ) except DistributionNotFound: # If it's not found, we don't care |