diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-26 10:07:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-26 10:07:59 +0000 |
| commit | 4edcbcee3b9579f4b50ecb97e566edab1a7c4c8b (patch) | |
| tree | 5ab27c5ebbfc762ee133223fb48e868b85474c79 /setup.py | |
| parent | Set the service ID as soon as it is known. (diff) | |
| parent | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict() (diff) | |
| download | synapse-4edcbcee3b9579f4b50ecb97e566edab1a7c4c8b.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py index 2d812fa389..ab24159be7 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ setup( version=version, packages=find_packages(exclude=["tests", "tests.*"]), description="Reference Synapse Home Server", - install_requires=dependencies["REQUIREMENTS"].keys(), + install_requires=dependencies['requirements'](include_conditional=True).keys(), setup_requires=[ "Twisted==14.0.2", # Here to override setuptools_trial's dependency on Twisted>=2.4.0 "setuptools_trial", @@ -55,5 +55,5 @@ setup( include_package_data=True, zip_safe=False, long_description=long_description, - scripts=["synctl"], + scripts=["synctl", "register_new_matrix_user"], ) |