diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-14 11:16:50 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-14 11:16:50 +0000 |
| commit | e903c941cb1bed18026f00ed1d3495a8d172f13a (patch) | |
| tree | 894da7441d913361b70da4cc13cd73ead86d2e67 /setup.py | |
| parent | Remove unused 'context' variables to appease pyflakes (diff) | |
| parent | Add notification-service unit tests. (diff) | |
| download | synapse-e903c941cb1bed18026f00ed1d3495a8d172f13a.tar.xz | |
Merge branch 'develop' into request_logging
Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/setup.py b/setup.py index 74eee31a78..7f46ce990f 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ def read(fname): setup( name="SynapseHomeServer", version="0.0.1", - packages=find_packages(exclude=["tests"]), + packages=find_packages(exclude=["tests", "tests.*"]), description="Reference Synapse Home Server", install_requires=[ "syutil==0.0.2", @@ -43,6 +43,7 @@ setup( ], dependency_links=[ "https://github.com/matrix-org/syutil/tarball/v0.0.2#egg=syutil-0.0.2", + "https://github.com/pyca/pynacl/tarball/52dbe2dc33f1#egg=pynacl-0.3.0", ], setup_requires=[ "setuptools_trial", @@ -54,6 +55,7 @@ setup( long_description=read("README.rst"), entry_points=""" [console_scripts] - synapse-homeserver=synapse.app.homeserver:main + synctl=synapse.app.synctl:main + synapse-homeserver=synapse.app.homeserver:run """ ) |