diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-28 15:35:39 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-28 15:35:39 +0100 |
| commit | 4d1ea4000856cd29778da2616fb8f602892905e0 (patch) | |
| tree | 68e4786675aa53586f31b27608f5acfe69a687af /synapse/python_dependencies.py | |
| parent | Allow users to redact their own events (diff) | |
| parent | Merge branch 'release-v0.10.0' into develop (diff) | |
| download | synapse-4d1ea4000856cd29778da2616fb8f602892905e0.tar.xz | |
Merge branch 'develop' into redactyoself
Conflicts: synapse/handlers/_base.py
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 4c07aa07aa..8ec272fd5f 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -46,8 +46,8 @@ CONDITIONAL_REQUIREMENTS = { def requirements(config=None, include_conditional=False): reqs = REQUIREMENTS.copy() - for key, req in CONDITIONAL_REQUIREMENTS.items(): - if (config and getattr(config, key)) or include_conditional: + if include_conditional: + for _, req in CONDITIONAL_REQUIREMENTS.items(): reqs.update(req) return reqs @@ -55,13 +55,13 @@ def requirements(config=None, include_conditional=False): def github_link(project, version, egg): return "https://github.com/%s/tarball/%s/#egg=%s" % (project, version, egg) -DEPENDENCY_LINKS = [ - github_link( +DEPENDENCY_LINKS = { + "matrix-angular-sdk": github_link( project="matrix-org/matrix-angular-sdk", version="v0.6.6", egg="matrix_angular_sdk-0.6.6", ), -] +} class MissingRequirementError(Exception): @@ -129,7 +129,7 @@ def check_requirements(config=None): def list_requirements(): result = [] linked = [] - for link in DEPENDENCY_LINKS: + for link in DEPENDENCY_LINKS.values(): egg = link.split("#egg=")[1] linked.append(egg.split('-')[0]) result.append(link) |