diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-12-22 01:37:26 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 01:37:26 +1100 |
| commit | c26f49a6645a84730811ea7bc5158d826bc43484 (patch) | |
| tree | 5080d8f5543391c24cb30c4bd7d4511edd00900a /synapse/app | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-c26f49a6645a84730811ea7bc5158d826bc43484.tar.xz | |
Make the dependencies more like a standard Python project and hook up the optional dependencies to setuptools (#4298)
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/__init__.py | 6 | ||||
| -rwxr-xr-x | synapse/app/homeserver.py | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index c3afcc573b..233bf43fc8 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -22,11 +22,11 @@ sys.dont_write_bytecode = True try: python_dependencies.check_requirements() -except python_dependencies.MissingRequirementError as e: +except python_dependencies.DependencyException as e: message = "\n".join([ - "Missing Requirement: %s" % (str(e),), + "Missing Requirements: %s" % (", ".join(e.dependencies),), "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), + " pip install --upgrade --force %s" % (" ".join(e.dependencies),), "", ]) sys.stderr.writelines(message) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index f2064f9d0c..f3ac3d19f0 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -322,9 +322,6 @@ def setup(config_options): synapse.config.logger.setup_logging(config, use_worker_options=False) - # check any extra requirements we have now we have a config - check_requirements(config) - events.USE_FROZEN_DICTS = config.use_frozen_dicts tls_server_context_factory = context_factory.ServerContextFactory(config) |