diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-20 16:31:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-20 16:31:48 +0000 |
| commit | f6583796feeff5a50c0988ce674a1ab861b14e34 (patch) | |
| tree | 47f9d5934440eef201c6ab65a0fb8df06631d18d /setup.py | |
| parent | Rearrange storage modules (diff) | |
| parent | Merge pull request #113 from matrix-org/store_rearrangement (diff) | |
| download | synapse-f6583796feeff5a50c0988ce674a1ab861b14e34.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
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"], ) |