Merge branch 'hotfixes-0.8.1a' of github.com:matrix-org/synapse

10 years ago · b26d85c30f
parent d028207a6e 0dcb145c7e
commit b26d85c30f
2 changed files with 2 additions and 2 deletions
--- 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",
--- 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"