diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-25 13:34:50 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-25 13:34:50 +0100 |
| commit | d9088c923f32fe1d2b6027320bb8fd5e46e1a428 (patch) | |
| tree | 946d9823714d180ab1e015d8ae8349e85a02d808 | |
| parent | Allow specifying a directory to host a web client from (diff) | |
| download | synapse-d9088c923f32fe1d2b6027320bb8fd5e46e1a428.tar.xz | |
Remove dependency on matrix-angular-sdk
| -rwxr-xr-x | synapse/app/homeserver.py | 9 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 2c59457cda..6255e9676e 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -99,7 +99,14 @@ class SynapseHomeServer(HomeServer): def build_resource_for_web_client(self): webclient_path = self.get_config().web_client_location if not webclient_path: - import syweb + try: + import syweb + except ImportError: + quit_with_error( + "Could not find a webclient. Please either install syweb\n" + "or configure the location of the source to server via\n" + "the config option `web_client_location`" + ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") # GZip is disabled here due to diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index fa06480ad1..61a362bb18 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -34,11 +34,7 @@ REQUIREMENTS = { "blist": ["blist"], "pysaml2": ["saml2"], } -CONDITIONAL_REQUIREMENTS = { - "web_client": { - "matrix_angular_sdk>=0.6.6": ["syweb>=0.6.6"], - } -} +CONDITIONAL_REQUIREMENTS = {} def requirements(config=None, include_conditional=False): |