Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on matrix-angular-sdk

This commit is contained in:
Erik Johnston 2015-08-25 13:34:50 +01:00
parent 86cef6a91b
commit d9088c923f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/app/homeserver.py
View File

@ -99,7 +99,14 @@ class SynapseHomeServer(HomeServer):
def build_resource_for_web_client(self): def build_resource_for_web_client(self):
webclient_path = self.get_config().web_client_location webclient_path = self.get_config().web_client_location
if not webclient_path: if not webclient_path:
try:
import syweb 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__) syweb_path = os.path.dirname(syweb.__file__)
webclient_path = os.path.join(syweb_path, "webclient") webclient_path = os.path.join(syweb_path, "webclient")
# GZip is disabled here due to # GZip is disabled here due to

6
synapse/python_dependencies.py
View File

@ -34,11 +34,7 @@ REQUIREMENTS = {
"blist": ["blist"], "blist": ["blist"],
"pysaml2": ["saml2"], "pysaml2": ["saml2"],
} }
CONDITIONAL_REQUIREMENTS = { CONDITIONAL_REQUIREMENTS = {}
"web_client": {
"matrix_angular_sdk>=0.6.6": ["syweb>=0.6.6"],
}
}
def requirements(config=None, include_conditional=False): def requirements(config=None, include_conditional=False):