From e55983defe216e5ee6f25b2c45f5a2d5361b0c35 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 4 Dec 2018 13:52:16 +0000 Subject: [PATCH 1/9] Prepare 0.34.0rc1 --- CHANGES.md | 56 ++++++++++++++++++++++++++++++++++++++++++++- synapse/__init__.py | 2 +- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1c3d575c3..c3e6c0681 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,57 @@ +Synapse 0.34.0rc1 (2018-12-04) +============================== + +Synapse 0.34 is the first reelase to fully support Python 3. We recommend +upgrading to Python 3, but make sure to read the +[UPGRADE.rst#upgrading-to-v0340](upgrade notes) when doing so. + +Features +-------- + +- Add option to track MAU stats (but not limit people) ([\#3830](https://github.com/matrix-org/synapse/issues/3830)) +- Add an option to enable recording IPs for appservice users ([\#3831](https://github.com/matrix-org/synapse/issues/3831)) +- Rename login type m.login.cas to m.login.sso ([\#4220](https://github.com/matrix-org/synapse/issues/4220)) +- Add an option to disable search for homeservers that may not be interested in it. ([\#4230](https://github.com/matrix-org/synapse/issues/4230)) + + +Bugfixes +-------- + +- Pushrules can now again be made with non-ASCII rule IDs. ([\#4165](https://github.com/matrix-org/synapse/issues/4165)) +- The media repository now no longer fails to decode UTF-8 filenames when downloading remote media. ([\#4176](https://github.com/matrix-org/synapse/issues/4176)) +- URL previews now correctly decode non-UTF-8 text if the header contains a ` Date: Tue, 4 Dec 2018 13:57:28 +0000 Subject: [PATCH 2/9] fix typo in changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c3e6c0681..e98c30d16 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,7 @@ Synapse 0.34.0rc1 (2018-12-04) ============================== -Synapse 0.34 is the first reelase to fully support Python 3. We recommend +Synapse 0.34 is the first release to fully support Python 3. We recommend upgrading to Python 3, but make sure to read the [UPGRADE.rst#upgrading-to-v0340](upgrade notes) when doing so. From fe324cb184132d9e954ac0b646cef5b8051955b5 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 4 Dec 2018 13:59:45 +0000 Subject: [PATCH 3/9] Fix link to upgrade notes --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e98c30d16..1ef0c212a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,7 @@ Synapse 0.34.0rc1 (2018-12-04) Synapse 0.34 is the first release to fully support Python 3. We recommend upgrading to Python 3, but make sure to read the -[UPGRADE.rst#upgrading-to-v0340](upgrade notes) when doing so. +[https://github.com/matrix-org/synapse/blob/release-v0.34.0/UPGRADE.rst#upgrading-to-v0340](upgrade notes) when doing so. Features -------- From dece89d2805e32710aa48dc43eea5387c253250f Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Tue, 4 Dec 2018 14:01:27 +0000 Subject: [PATCH 4/9] fix upgrade.rst link again --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 1ef0c212a..bd420ba5e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,7 @@ Synapse 0.34.0rc1 (2018-12-04) Synapse 0.34 is the first release to fully support Python 3. We recommend upgrading to Python 3, but make sure to read the -[https://github.com/matrix-org/synapse/blob/release-v0.34.0/UPGRADE.rst#upgrading-to-v0340](upgrade notes) when doing so. +[upgrade notes](UPGRADE.rst#upgrading-to-v0340) when doing so. Features -------- From df96177ca7f6f646baf96e779e0bf0ef38cc5168 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 11 Dec 2018 13:18:48 +0000 Subject: [PATCH 5/9] Stop installing Matrix Console by default This is based on the work done by @krombel in #2601. --- README.rst | 9 +------ UPGRADE.rst | 4 ++++ changelog.d/4290.feature | 1 + synapse/app/homeserver.py | 43 +++++++++------------------------- synapse/config/server.py | 42 +++++++++++++++++++++------------ synapse/python_dependencies.py | 3 --- 6 files changed, 44 insertions(+), 58 deletions(-) create mode 100644 changelog.d/4290.feature diff --git a/README.rst b/README.rst index 664a0ea03..02b3db1bc 100644 --- a/README.rst +++ b/README.rst @@ -289,10 +289,6 @@ go back in your web client and proceed further. If all goes well you should at least be able to log in, create a room, and start sending messages. -(The homeserver runs a web client by default at https://localhost:8448/, though -as of the time of writing it is somewhat outdated and not really recommended - -https://github.com/matrix-org/synapse/issues/1527). - .. _`client-user-reg`: Registering a new user from a client @@ -372,10 +368,7 @@ ArchLinux The quickest way to get up and running with ArchLinux is probably with the community package https://www.archlinux.org/packages/community/any/matrix-synapse/, which should pull in most of -the necessary dependencies. If the default web client is to be served (enabled by default in -the generated config), -https://www.archlinux.org/packages/community/any/python2-matrix-angular-sdk/ will also need to -be installed. +the necessary dependencies. pip may be outdated (6.0.7-1 and needs to be upgraded to 6.0.8-1 ):: diff --git a/UPGRADE.rst b/UPGRADE.rst index 9d68a6405..95f4e3330 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -115,6 +115,10 @@ Upgrading to v0.34.0 case a hypothetical future identity server was put there. If you don't remove it, users may be unable to deactivate their accounts. +3. This release no longer installs the (unmaintained) Matrix Console web client + as part of the default installation. It is possible to re-enable it by + installing it separately and setting the ``web_client_location`` config + option, but please consider switching to another client. Upgrading to v0.33.7 ==================== diff --git a/changelog.d/4290.feature b/changelog.d/4290.feature new file mode 100644 index 000000000..df5114bae --- /dev/null +++ b/changelog.d/4290.feature @@ -0,0 +1 @@ +Remove Matrix console from the default distribution diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 3e4dea2f1..a6af553f7 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -54,7 +54,7 @@ from synapse.metrics import RegistryProxy from synapse.metrics.background_process_metrics import run_as_background_process from synapse.metrics.resource import METRICS_PREFIX, MetricsResource from synapse.module_api import ModuleApi -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, check_requirements +from synapse.python_dependencies import check_requirements from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -79,36 +79,6 @@ def gz_wrap(r): return EncodingResourceWrapper(r, [GzipEncoderFactory()]) -def build_resource_for_web_client(hs): - webclient_path = hs.get_config().web_client_location - if not webclient_path: - try: - import syweb - except ImportError: - quit_with_error( - "Could not find a webclient.\n\n" - "Please either install the matrix-angular-sdk or configure\n" - "the location of the source to serve via the configuration\n" - "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" - "\n" - "You can also disable hosting of the webclient via the\n" - "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} - ) - syweb_path = os.path.dirname(syweb.__file__) - webclient_path = os.path.join(syweb_path, "webclient") - # GZip is disabled here due to - # https://twistedmatrix.com/trac/ticket/7678 - # (It can stay enabled for the API resources: they call - # write() with the whole body and then finish() straight - # after and so do not trigger the bug. - # GzipFile was removed in commit 184ba09 - # return GzipFile(webclient_path) # TODO configurable? - return File(webclient_path) # TODO configurable? - - class SynapseHomeServer(HomeServer): DATASTORE_CLASS = DataStore @@ -237,7 +207,16 @@ class SynapseHomeServer(HomeServer): resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self) if name == "webclient": - resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) + webclient_path = self.get_config().web_client_location + + if webclient_path is None: + logger.warning( + "Not enabling webclient resource, as web_client_location is unset." + ) + else: + # GZip is disabled here due to + # https://twistedmatrix.com/trac/ticket/7678 + resources[WEB_CLIENT_PREFIX] = File(webclient_path) if name == "metrics" and self.get_config().enable_metrics: resources[METRICS_PREFIX] = MetricsResource(RegistryProxy) diff --git a/synapse/config/server.py b/synapse/config/server.py index 4a5b902f8..a9154ad46 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -34,7 +34,6 @@ class ServerConfig(Config): raise ConfigError(str(e)) self.pid_file = self.abspath(config.get("pid_file")) - self.web_client = config["web_client"] self.web_client_location = config.get("web_client_location", None) self.soft_file_limit = config["soft_file_limit"] self.daemonize = config.get("daemonize") @@ -128,6 +127,9 @@ class ServerConfig(Config): elif not bind_addresses: bind_addresses.append('') + if not self.web_client_location: + _warn_if_webclient_configured(self.listeners) + self.gc_thresholds = read_gc_thresholds(config.get("gc_thresholds", None)) bind_port = config.get("bind_port") @@ -136,8 +138,6 @@ class ServerConfig(Config): bind_host = config.get("bind_host", "") gzip_responses = config.get("gzip_responses", True) - names = ["client", "webclient"] if self.web_client else ["client"] - self.listeners.append({ "port": bind_port, "bind_addresses": [bind_host], @@ -145,7 +145,7 @@ class ServerConfig(Config): "type": "http", "resources": [ { - "names": names, + "names": ["client"], "compress": gzip_responses, }, { @@ -164,7 +164,7 @@ class ServerConfig(Config): "type": "http", "resources": [ { - "names": names, + "names": ["client"], "compress": gzip_responses, }, { @@ -247,13 +247,9 @@ class ServerConfig(Config): # # cpu_affinity: 0xFFFFFFFF - # Whether to serve a web client from the HTTP/HTTPS root resource. - web_client: True - - # The root directory to server for the above web client. - # If left undefined, synapse will serve the matrix-angular-sdk web client. - # Make sure matrix-angular-sdk is installed with pip if web_client is True - # and web_client_location is undefined + # The path to the web client which will be served at /_matrix/client/ + # if 'webclient' is configured under the 'listeners' configuration. + # # web_client_location: "/path/to/web/root" # The public-facing base URL for the client API (not including _matrix/...) @@ -320,8 +316,8 @@ class ServerConfig(Config): - # List of resources to host on this listener. names: - - client # The client-server APIs, both v1 and v2 - - webclient # The bundled webclient. + - client # The client-server APIs, both v1 and v2 + # - webclient # A web client. Requires web_client_location to be set. # Should synapse compress HTTP responses to clients that support it? # This should be disabled if running synapse behind a load balancer @@ -348,7 +344,7 @@ class ServerConfig(Config): x_forwarded: false resources: - - names: [client, webclient] + - names: [client] compress: true - names: [federation] compress: false @@ -452,3 +448,19 @@ def read_gc_thresholds(thresholds): raise ConfigError( "Value of `gc_threshold` must be a list of three integers if set" ) + + +NO_MORE_WEB_CLIENT_WARNING = """ +Synapse no longer includes a web client. To enable a web client, configure +web_client_location. To remove this warning, remove 'webclient' from the 'listeners' +configuration. +""" + + +def _warn_if_webclient_configured(listeners): + for listener in listeners: + for res in listener.get("resources", []): + for name in res.get("names", []): + if name == 'webclient': + logger.warning(NO_MORE_WEB_CLIENT_WARNING) + return diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index ca62ee763..92422c6ff 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -69,9 +69,6 @@ REQUIREMENTS = { } CONDITIONAL_REQUIREMENTS = { - "web_client": { - "matrix_angular_sdk>=0.6.8": ["syweb>=0.6.8"], - }, "email.enable_notifs": { "Jinja2>=2.8": ["Jinja2>=2.8"], "bleach>=1.4.2": ["bleach>=1.4.2"], From f537432ef96baf07703805c43d16df45ea765044 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 11 Dec 2018 12:18:19 +0000 Subject: [PATCH 6/9] Add a welcome page to the static resources This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601. --- changelog.d/4289.feature | 1 + synapse/app/homeserver.py | 3 +++ synapse/static/index.html | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 changelog.d/4289.feature create mode 100644 synapse/static/index.html diff --git a/changelog.d/4289.feature b/changelog.d/4289.feature new file mode 100644 index 000000000..4d53bd22c --- /dev/null +++ b/changelog.d/4289.feature @@ -0,0 +1 @@ +Add a welcome page for the client API port. Credit to @krombel! \ No newline at end of file diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 3e4dea2f1..e433c6655 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -137,8 +137,11 @@ class SynapseHomeServer(HomeServer): handler = handler_cls(config, module_api) resources[path] = AdditionalResource(self, handler.handle_request) + # try to find something useful to redirect '/' to if WEB_CLIENT_PREFIX in resources: root_resource = RootRedirect(WEB_CLIENT_PREFIX) + elif STATIC_PREFIX in resources: + root_resource = RootRedirect(STATIC_PREFIX) else: root_resource = NoResource() diff --git a/synapse/static/index.html b/synapse/static/index.html new file mode 100644 index 000000000..d66423998 --- /dev/null +++ b/synapse/static/index.html @@ -0,0 +1,26 @@ + + + Synapse is running + + + +

Synapse is running

+

Congratulations!

+

Your Synapse server is listening on this port and is ready for messages.

+

To use this server you'll need a client - e.g. one of + this list of Matrix clients.

+

You can find (federated) rooms that might be of interest to you on + view.matrix.org.

+

Or you just start creating your own rooms with your friends.

+

Welcome to the Matrix universe :)

+ + From 2755a0d48a6ac290ee54ef402eb6947b0858558d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 11 Dec 2018 14:11:30 +0000 Subject: [PATCH 7/9] Disable pager for ci script ... otherwise it hangs --- .circleci/merge_base_branch.sh | 4 ++-- changelog.d/4291.misc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/4291.misc diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh index b2c8c40f4..4c19fa70d 100755 --- a/.circleci/merge_base_branch.sh +++ b/.circleci/merge_base_branch.sh @@ -20,7 +20,7 @@ else fi # Show what we are before -git show -s +git --no-pager show -s # Set up username so it can do a merge git config --global user.email bot@matrix.org @@ -31,4 +31,4 @@ git fetch -u origin $GITBASE git merge --no-edit origin/$GITBASE # Show what we are after. -git show -s +git --no-pager show -s diff --git a/changelog.d/4291.misc b/changelog.d/4291.misc new file mode 100644 index 000000000..d3bfe3dd0 --- /dev/null +++ b/changelog.d/4291.misc @@ -0,0 +1 @@ +Disable pager when running git-show in CI \ No newline at end of file From 03116da9847ae1ebe9f698d55f5373615556bbc3 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 11 Dec 2018 15:34:17 +0000 Subject: [PATCH 8/9] remove changelog files --- changelog.d/3830.feature | 1 - changelog.d/3831.feature | 1 - changelog.d/4165.bugfix | 1 - changelog.d/4176.bugfix | 1 - changelog.d/4180.misc | 1 - changelog.d/4182.misc | 1 - changelog.d/4183.bugfix | 1 - changelog.d/4188.misc | 1 - changelog.d/4189.misc | 2 -- changelog.d/4190.misc | 1 - changelog.d/4192.bugfix | 1 - changelog.d/4193.misc | 1 - changelog.d/4197.bugfix | 1 - changelog.d/4200.misc | 1 - changelog.d/4204.misc | 1 - changelog.d/4205.misc | 1 - changelog.d/4207.bugfix | 1 - changelog.d/4209.misc | 1 - changelog.d/4211.bugfix | 2 -- changelog.d/4214.misc | 1 - changelog.d/4220.feature | 1 - changelog.d/4223.bugfix | 1 - changelog.d/4224.misc | 1 - changelog.d/4225.misc | 1 - changelog.d/4227.misc | 1 - changelog.d/4230.feature | 1 - changelog.d/4234.misc | 1 - changelog.d/4241.bugfix | 1 - changelog.d/4244.misc | 1 - changelog.d/4250.bugfix | 1 - changelog.d/4253.bugfix | 1 - changelog.d/4257.misc | 1 - changelog.d/4260.misc | 1 - changelog.d/4261.misc | 1 - 34 files changed, 36 deletions(-) delete mode 100644 changelog.d/3830.feature delete mode 100644 changelog.d/3831.feature delete mode 100644 changelog.d/4165.bugfix delete mode 100644 changelog.d/4176.bugfix delete mode 100644 changelog.d/4180.misc delete mode 100644 changelog.d/4182.misc delete mode 100644 changelog.d/4183.bugfix delete mode 100644 changelog.d/4188.misc delete mode 100644 changelog.d/4189.misc delete mode 100644 changelog.d/4190.misc delete mode 100644 changelog.d/4192.bugfix delete mode 100644 changelog.d/4193.misc delete mode 100644 changelog.d/4197.bugfix delete mode 100644 changelog.d/4200.misc delete mode 100644 changelog.d/4204.misc delete mode 100644 changelog.d/4205.misc delete mode 100644 changelog.d/4207.bugfix delete mode 100644 changelog.d/4209.misc delete mode 100644 changelog.d/4211.bugfix delete mode 100644 changelog.d/4214.misc delete mode 100644 changelog.d/4220.feature delete mode 100644 changelog.d/4223.bugfix delete mode 100644 changelog.d/4224.misc delete mode 100644 changelog.d/4225.misc delete mode 100644 changelog.d/4227.misc delete mode 100644 changelog.d/4230.feature delete mode 100644 changelog.d/4234.misc delete mode 100644 changelog.d/4241.bugfix delete mode 100644 changelog.d/4244.misc delete mode 100644 changelog.d/4250.bugfix delete mode 100644 changelog.d/4253.bugfix delete mode 100644 changelog.d/4257.misc delete mode 100644 changelog.d/4260.misc delete mode 100644 changelog.d/4261.misc diff --git a/changelog.d/3830.feature b/changelog.d/3830.feature deleted file mode 100644 index af472cf76..000000000 --- a/changelog.d/3830.feature +++ /dev/null @@ -1 +0,0 @@ -Add option to track MAU stats (but not limit people) diff --git a/changelog.d/3831.feature b/changelog.d/3831.feature deleted file mode 100644 index 639558645..000000000 --- a/changelog.d/3831.feature +++ /dev/null @@ -1 +0,0 @@ -Add an option to enable recording IPs for appservice users diff --git a/changelog.d/4165.bugfix b/changelog.d/4165.bugfix deleted file mode 100644 index fe31c6068..000000000 --- a/changelog.d/4165.bugfix +++ /dev/null @@ -1 +0,0 @@ -Pushrules can now again be made with non-ASCII rule IDs. diff --git a/changelog.d/4176.bugfix b/changelog.d/4176.bugfix deleted file mode 100644 index 3846f8a27..000000000 --- a/changelog.d/4176.bugfix +++ /dev/null @@ -1 +0,0 @@ -The media repository now no longer fails to decode UTF-8 filenames when downloading remote media. diff --git a/changelog.d/4180.misc b/changelog.d/4180.misc deleted file mode 100644 index 80194b3dc..000000000 --- a/changelog.d/4180.misc +++ /dev/null @@ -1 +0,0 @@ -A coveragerc file, as well as the py36-coverage tox target, have been added. diff --git a/changelog.d/4182.misc b/changelog.d/4182.misc deleted file mode 100644 index 62949a065..000000000 --- a/changelog.d/4182.misc +++ /dev/null @@ -1 +0,0 @@ -Add a GitHub pull request template and add multiple issue templates diff --git a/changelog.d/4183.bugfix b/changelog.d/4183.bugfix deleted file mode 100644 index 3e9ba3826..000000000 --- a/changelog.d/4183.bugfix +++ /dev/null @@ -1 +0,0 @@ -URL previews now correctly decode non-UTF-8 text if the header contains a ` Date: Tue, 11 Dec 2018 15:35:47 +0000 Subject: [PATCH 9/9] 0.34.0rc2 --- CHANGES.md | 16 ++++++++++++++++ changelog.d/4289.feature | 1 - changelog.d/4290.feature | 1 - changelog.d/4291.misc | 1 - synapse/__init__.py | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) delete mode 100644 changelog.d/4289.feature delete mode 100644 changelog.d/4290.feature delete mode 100644 changelog.d/4291.misc diff --git a/CHANGES.md b/CHANGES.md index bd420ba5e..68210a7d6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,19 @@ +Synapse 0.34.0rc2 (2018-12-11) +============================== + +Features +-------- + +- Add a welcome page for the client API port. Credit to @krombel! ([\#4289](https://github.com/matrix-org/synapse/issues/4289)) +- Remove Matrix console from the default distribution ([\#4290](https://github.com/matrix-org/synapse/issues/4290)) + + +Internal Changes +---------------- + +- Disable pager when running git-show in CI ([\#4291](https://github.com/matrix-org/synapse/issues/4291)) + + Synapse 0.34.0rc1 (2018-12-04) ============================== diff --git a/changelog.d/4289.feature b/changelog.d/4289.feature deleted file mode 100644 index 4d53bd22c..000000000 --- a/changelog.d/4289.feature +++ /dev/null @@ -1 +0,0 @@ -Add a welcome page for the client API port. Credit to @krombel! \ No newline at end of file diff --git a/changelog.d/4290.feature b/changelog.d/4290.feature deleted file mode 100644 index df5114bae..000000000 --- a/changelog.d/4290.feature +++ /dev/null @@ -1 +0,0 @@ -Remove Matrix console from the default distribution diff --git a/changelog.d/4291.misc b/changelog.d/4291.misc deleted file mode 100644 index d3bfe3dd0..000000000 --- a/changelog.d/4291.misc +++ /dev/null @@ -1 +0,0 @@ -Disable pager when running git-show in CI \ No newline at end of file diff --git a/synapse/__init__.py b/synapse/__init__.py index df0504ac2..d5f6dc209 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -27,4 +27,4 @@ try: except ImportError: pass -__version__ = "0.34.0rc1" +__version__ = "0.34.0rc2"