diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-19 11:26:29 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-19 11:26:29 +0000 |
| commit | b26d85c30f117fd3146d2701198d02596251ad49 (patch) | |
| tree | 1e0d43bc0588a14a043a9afaceb58d4eeb2a8512 | |
| parent | Merge branch 'release-v0.8.1' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version (diff) | |
| download | synapse-b26d85c30f117fd3146d2701198d02596251ad49.tar.xz | |
Merge branch 'hotfixes-0.8.1a' of github.com:matrix-org/synapse v0.8.1-r1
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py index 45943adb2c..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", diff --git a/synapse/__init__.py b/synapse/__init__.py index e134fb2415..ca53f2db8d 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.8.1" +__version__ = "0.8.1-r1" |