Merge branch 'master' into develop

2018-10-04 22:41:52 +10:00 · 2018-10-04 22:41:52 +10:00 · d86794325f
commit d86794325f
parent 8935ec5a93 92faeb2a3f
63 changed files with 88 additions and 66 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -156,7 +156,7 @@ workflows:
      - dockerhubuploadrelease:
          filters:
            tags:
-              only: /^v[0-9].[0-9]+.[0-9]+(.[0-9]+)?/
+              only: /v[0-9].[0-9]+.[0-9]+.*/
            branches:
              ignore: /.*/
      - dockerhubuploadlatest:
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,11 +1,91 @@
 Synapse 0.33.6 (2018-10-04)
 ===========================
 Internal Changes
 ----------------
 - Pin to prometheus_client<0.4 to avoid renaming all of our metrics ([\#4002](https://github.com/matrix-org/synapse/issues/4002))
 Synapse 0.33.6rc1 (2018-10-03)
 ==============================
 Features
 --------
 - Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables. ([\#3883](https://github.com/matrix-org/synapse/issues/3883))
 - Report "python_version" in the phone home stats ([\#3894](https://github.com/matrix-org/synapse/issues/3894))
 - Always LL ourselves if we're in a room ([\#3916](https://github.com/matrix-org/synapse/issues/3916))
 - Include eventid in log lines when processing incoming federation transactions ([\#3959](https://github.com/matrix-org/synapse/issues/3959))
 - Remove spurious check which made 'localhost' servers not work ([\#3964](https://github.com/matrix-org/synapse/issues/3964))
 Bugfixes
 --------
 - Fix problem when playing media from Chrome using direct URL (thanks @remjey!) ([\#3578](https://github.com/matrix-org/synapse/issues/3578))
 - support registering regular users non-interactively with register_new_matrix_user script ([\#3836](https://github.com/matrix-org/synapse/issues/3836))
 - Fix broken invite email links for self hosted riots ([\#3868](https://github.com/matrix-org/synapse/issues/3868))
 - Don't ratelimit autojoins ([\#3879](https://github.com/matrix-org/synapse/issues/3879))
 - Fix 500 error when deleting unknown room alias ([\#3889](https://github.com/matrix-org/synapse/issues/3889))
 - Fix some b'abcd' noise in logs and metrics ([\#3892](https://github.com/matrix-org/synapse/issues/3892), [\#3895](https://github.com/matrix-org/synapse/issues/3895))
 - When we join a room, always try the server we used for the alias lookup first, to avoid unresponsive and out-of-date servers. ([\#3899](https://github.com/matrix-org/synapse/issues/3899))
 - Fix incorrect server-name indication for outgoing federation requests ([\#3907](https://github.com/matrix-org/synapse/issues/3907))
 - Fix adding client IPs to the database failing on Python 3. ([\#3908](https://github.com/matrix-org/synapse/issues/3908))
 - Fix bug where things occaisonally were not being timed out correctly. ([\#3910](https://github.com/matrix-org/synapse/issues/3910))
 - Fix bug where outbound federation would stop talking to some servers when using workers ([\#3914](https://github.com/matrix-org/synapse/issues/3914))
 - Fix some instances of ExpiringCache not expiring cache items ([\#3932](https://github.com/matrix-org/synapse/issues/3932), [\#3980](https://github.com/matrix-org/synapse/issues/3980))
 - Fix out-of-bounds error when LLing yourself ([\#3936](https://github.com/matrix-org/synapse/issues/3936))
 - Sending server notices regarding user consent now works on Python 3. ([\#3938](https://github.com/matrix-org/synapse/issues/3938))
 - Fix exceptions from metrics handler ([\#3956](https://github.com/matrix-org/synapse/issues/3956))
 - Fix error message for events with m.room.create missing from auth_events ([\#3960](https://github.com/matrix-org/synapse/issues/3960))
 - Fix errors due to concurrent monthly_active_user upserts ([\#3961](https://github.com/matrix-org/synapse/issues/3961))
 - Fix exceptions when processing incoming events over federation ([\#3968](https://github.com/matrix-org/synapse/issues/3968))
 - Replaced all occurences of e.message with str(e). Contributed by Schnuffle ([\#3970](https://github.com/matrix-org/synapse/issues/3970))
 - Fix lazy loaded sync in the presence of rejected state events ([\#3986](https://github.com/matrix-org/synapse/issues/3986))
 - Fix error when logging incomplete HTTP requests ([\#3990](https://github.com/matrix-org/synapse/issues/3990))
 Internal Changes
 ----------------
 - Unit tests can now be run under PostgreSQL in Docker using ``test_postgresql.sh``. ([\#3699](https://github.com/matrix-org/synapse/issues/3699))
 - Speed up calculation of typing updates for replication ([\#3794](https://github.com/matrix-org/synapse/issues/3794))
 - Remove documentation regarding installation on Cygwin, the use of WSL is recommended instead. ([\#3873](https://github.com/matrix-org/synapse/issues/3873))
 - Fix typo in README, synaspse -> synapse ([\#3897](https://github.com/matrix-org/synapse/issues/3897))
 - Increase the timeout when filling missing events in federation requests ([\#3903](https://github.com/matrix-org/synapse/issues/3903))
 - Improve the logging when handling a federation transaction ([\#3904](https://github.com/matrix-org/synapse/issues/3904), [\#3966](https://github.com/matrix-org/synapse/issues/3966))
 - Improve logging of outbound federation requests ([\#3906](https://github.com/matrix-org/synapse/issues/3906), [\#3909](https://github.com/matrix-org/synapse/issues/3909))
 - Fix the docker image building on python 3 ([\#3911](https://github.com/matrix-org/synapse/issues/3911))
 - Add a regression test for logging failed HTTP requests on Python 3. ([\#3912](https://github.com/matrix-org/synapse/issues/3912))
 - Comments and interface cleanup for on_receive_pdu ([\#3924](https://github.com/matrix-org/synapse/issues/3924))
 - Fix spurious exceptions when remote http client closes conncetion ([\#3925](https://github.com/matrix-org/synapse/issues/3925))
 - Log exceptions thrown by background tasks ([\#3927](https://github.com/matrix-org/synapse/issues/3927))
 - Add a cache to get_destination_retry_timings ([\#3933](https://github.com/matrix-org/synapse/issues/3933), [\#3991](https://github.com/matrix-org/synapse/issues/3991))
 - Automate pushes to docker hub ([\#3946](https://github.com/matrix-org/synapse/issues/3946))
 - Require attrs 16.0.0 or later ([\#3947](https://github.com/matrix-org/synapse/issues/3947))
 - Fix incompatibility with python3 on alpine ([\#3948](https://github.com/matrix-org/synapse/issues/3948))
 - Run the test suite on the oldest supported versions of our dependencies in CI. ([\#3952](https://github.com/matrix-org/synapse/issues/3952))
 - CircleCI now only runs merged jobs on PRs, and commit jobs on develop, master, and release branches. ([\#3957](https://github.com/matrix-org/synapse/issues/3957))
 - Fix docstrings and add tests for state store methods ([\#3958](https://github.com/matrix-org/synapse/issues/3958))
 - fix docstring for FederationClient.get_state_for_room ([\#3963](https://github.com/matrix-org/synapse/issues/3963))
 - Run notify_app_services as a bg process ([\#3965](https://github.com/matrix-org/synapse/issues/3965))
 - Clarifications in FederationHandler ([\#3967](https://github.com/matrix-org/synapse/issues/3967))
 - Further reduce the docker image size ([\#3972](https://github.com/matrix-org/synapse/issues/3972))
 - Build py3 docker images for docker hub too ([\#3976](https://github.com/matrix-org/synapse/issues/3976))
 - Updated the installation instructions to point to the matrix-synapse package on PyPI. ([\#3985](https://github.com/matrix-org/synapse/issues/3985))
 - Disable USE_FROZEN_DICTS for unittests by default. ([\#3987](https://github.com/matrix-org/synapse/issues/3987))
 - Remove unused Jenkins and development related files from the repo. ([\#3988](https://github.com/matrix-org/synapse/issues/3988))
 - Improve stacktraces in certain exceptions in the logs ([\#3989](https://github.com/matrix-org/synapse/issues/3989))
 Synapse 0.33.5.1 (2018-09-25)
 =============================
 Internal Changes
 ----------------
- Fix incompatibility with older Twisted version in tests. Thanks 
+- Fix incompatibility with older Twisted version in tests. Thanks @OlegGirko! ([\#3940](https://github.com/matrix-org/synapse/issues/3940))
  @OlegGirko! ([\#3940](https://github.com/matrix-org/synapse/issues/3940))
 Synapse 0.33.5 (2018-09-24)
--- a/changelog.d/3578.bugfix
+++ b/changelog.d/3578.bugfix
@ -1 +0,0 @@
 Fix problem when playing media from Chrome using direct URL (thanks @remjey!)
--- a/changelog.d/3699.misc
+++ b/changelog.d/3699.misc
@ -1,2 +0,0 @@
 Unit tests can now be run under PostgreSQL in Docker using 
 ``test_postgresql.sh``.
--- a/changelog.d/3794.misc
+++ b/changelog.d/3794.misc
@ -1 +0,0 @@
 Speed up calculation of typing updates for replication
--- a/changelog.d/3836.bugfix
+++ b/changelog.d/3836.bugfix
@ -1 +0,0 @@
 support registering regular users non-interactively with register_new_matrix_user script
--- a/changelog.d/3868.bugfix
+++ b/changelog.d/3868.bugfix
@ -1 +0,0 @@
 Fix broken invite email links for self hosted riots 
--- a/changelog.d/3873.misc
+++ b/changelog.d/3873.misc
@ -1,2 +0,0 @@
 Remove documentation regarding installation on Cygwin, the use of WSL is 
 recommended instead.
--- a/changelog.d/3879.bugfix
+++ b/changelog.d/3879.bugfix
@ -1 +0,0 @@
 Don't ratelimit autojoins
--- a/changelog.d/3883.feature
+++ b/changelog.d/3883.feature
@ -1 +0,0 @@
 Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.
--- a/changelog.d/3889.bugfix
+++ b/changelog.d/3889.bugfix
@ -1 +0,0 @@
 Fix 500 error when deleting unknown room alias
--- a/changelog.d/3892.bugfix
+++ b/changelog.d/3892.bugfix
@ -1 +0,0 @@
 Fix some b'abcd' noise in logs and metrics
--- a/changelog.d/3894.feature
+++ b/changelog.d/3894.feature
@ -1 +0,0 @@
 Report "python_version" in the phone home stats
--- a/changelog.d/3895.bugfix
+++ b/changelog.d/3895.bugfix
@ -1 +0,0 @@
 Fix some b'abcd' noise in logs and metrics
--- a/changelog.d/3897.misc
+++ b/changelog.d/3897.misc
@ -1 +0,0 @@
 Fix typo in README, synaspse -> synapse
--- a/changelog.d/3899.bugfix
+++ b/changelog.d/3899.bugfix
@ -1 +0,0 @@
 When we join a room, always try the server we used for the alias lookup first, to avoid unresponsive and out-of-date servers.
--- a/changelog.d/3903.misc
+++ b/changelog.d/3903.misc
@ -1 +0,0 @@
 Increase the timeout when filling missing events in federation requests
--- a/changelog.d/3904.misc
+++ b/changelog.d/3904.misc
@ -1 +0,0 @@
 Improve the logging when handling a federation transaction
--- a/changelog.d/3906.misc
+++ b/changelog.d/3906.misc
@ -1 +0,0 @@
 Improve logging of outbound federation requests
--- a/changelog.d/3907.bugfix
+++ b/changelog.d/3907.bugfix
@ -1 +0,0 @@
 Fix incorrect server-name indication for outgoing federation requests
--- a/changelog.d/3908.bugfix
+++ b/changelog.d/3908.bugfix
@ -1 +0,0 @@
 Fix adding client IPs to the database failing on Python 3.
--- a/changelog.d/3909.misc
+++ b/changelog.d/3909.misc
@ -1 +0,0 @@
 Improve logging of outbound federation requests
--- a/changelog.d/3910.bugfix
+++ b/changelog.d/3910.bugfix
@ -1 +0,0 @@
 Fix bug where things occaisonally were not being timed out correctly.
--- a/changelog.d/3911.misc
+++ b/changelog.d/3911.misc
@ -1 +0,0 @@
 Fix the docker image building on python 3
--- a/changelog.d/3912.misc
+++ b/changelog.d/3912.misc
@ -1 +0,0 @@
 Add a regression test for logging failed HTTP requests on Python 3.
--- a/changelog.d/3914.bugfix
+++ b/changelog.d/3914.bugfix
@ -1 +0,0 @@
 Fix bug where outbound federation would stop talking to some servers when using workers
--- a/changelog.d/3916.feature
+++ b/changelog.d/3916.feature
@ -1 +0,0 @@
 Always LL ourselves if we're in a room
--- a/changelog.d/3924.misc
+++ b/changelog.d/3924.misc
@ -1 +0,0 @@
 Comments and interface cleanup for on_receive_pdu
--- a/changelog.d/3925.misc
+++ b/changelog.d/3925.misc
@ -1 +0,0 @@
 Fix spurious exceptions when remote http client closes conncetion
--- a/changelog.d/3927.misc
+++ b/changelog.d/3927.misc
@ -1 +0,0 @@
 Log exceptions thrown by background tasks
--- a/changelog.d/3932.bugfix
+++ b/changelog.d/3932.bugfix
@ -1 +0,0 @@
 Fix some instances of ExpiringCache not expiring cache items
--- a/changelog.d/3933.misc
+++ b/changelog.d/3933.misc
@ -1 +0,0 @@
 Add a cache to get_destination_retry_timings
--- a/changelog.d/3936.bugfix
+++ b/changelog.d/3936.bugfix
@ -1 +0,0 @@
 Fix out-of-bounds error when LLing yourself
--- a/changelog.d/3938.bugfix
+++ b/changelog.d/3938.bugfix
@ -1 +0,0 @@
 Sending server notices regarding user consent now works on Python 3.
--- a/changelog.d/3946.misc
+++ b/changelog.d/3946.misc
@ -1 +0,0 @@
 Automate pushes to docker hub
--- a/changelog.d/3947.misc
+++ b/changelog.d/3947.misc
@ -1 +0,0 @@
 Require attrs 16.0.0 or later
--- a/changelog.d/3948.misc
+++ b/changelog.d/3948.misc
@ -1 +0,0 @@
 Fix incompatibility with python3 on alpine
--- a/changelog.d/3952.misc
+++ b/changelog.d/3952.misc
@ -1 +0,0 @@
 Run the test suite on the oldest supported versions of our dependencies in CI.
--- a/changelog.d/3956.bugfix
+++ b/changelog.d/3956.bugfix
@ -1 +0,0 @@
 Fix exceptions from metrics handler
--- a/changelog.d/3957.misc
+++ b/changelog.d/3957.misc
@ -1 +0,0 @@
 CircleCI now only runs merged jobs on PRs, and commit jobs on develop, master, and release branches.
--- a/changelog.d/3958.misc
+++ b/changelog.d/3958.misc
@ -1 +0,0 @@
 Fix docstrings and add tests for state store methods
--- a/changelog.d/3959.feature
+++ b/changelog.d/3959.feature
@ -1 +0,0 @@
 Include eventid in log lines when processing incoming federation transactions
--- a/changelog.d/3960.bugfix
+++ b/changelog.d/3960.bugfix
@ -1 +0,0 @@
 Fix error message for events with m.room.create missing from auth_events
--- a/changelog.d/3961.bugfix
+++ b/changelog.d/3961.bugfix
@ -1 +0,0 @@
 Fix errors due to concurrent monthly_active_user upserts 
--- a/changelog.d/3963.misc
+++ b/changelog.d/3963.misc
@ -1 +0,0 @@
 fix docstring for FederationClient.get_state_for_room
--- a/changelog.d/3964.feature
+++ b/changelog.d/3964.feature
@ -1 +0,0 @@
 Remove spurious check which made 'localhost' servers not work
--- a/changelog.d/3965.misc
+++ b/changelog.d/3965.misc
@ -1 +0,0 @@
 Run notify_app_services as a bg process
--- a/changelog.d/3966.misc
+++ b/changelog.d/3966.misc
@ -1 +0,0 @@
 Improve the logging when handling a federation transaction
--- a/changelog.d/3967.misc
+++ b/changelog.d/3967.misc
@ -1 +0,0 @@
 Clarifications in FederationHandler
--- a/changelog.d/3968.bugfix
+++ b/changelog.d/3968.bugfix
@ -1 +0,0 @@
 Fix exceptions when processing incoming events over federation
--- a/changelog.d/3970.bugfix
+++ b/changelog.d/3970.bugfix
@ -1 +0,0 @@
 Replaced all occurences of e.message with str(e). Contributed by Schnuffle
--- a/changelog.d/3972.misc
+++ b/changelog.d/3972.misc
@ -1 +0,0 @@
 Further reduce the docker image size
--- a/changelog.d/3976.misc
+++ b/changelog.d/3976.misc
@ -1 +0,0 @@
 Build py3 docker images for docker hub too
--- a/changelog.d/3980.bugfix
+++ b/changelog.d/3980.bugfix
@ -1 +0,0 @@
 Fix some instances of ExpiringCache not expiring cache items
--- a/changelog.d/3985.misc
+++ b/changelog.d/3985.misc
@ -1 +0,0 @@
 Updated the installation instructions to point to the matrix-synapse package on PyPI.
--- a/changelog.d/3986.bugfix
+++ b/changelog.d/3986.bugfix
@ -1 +0,0 @@
 Fix lazy loaded sync in the presence of rejected state events
--- a/changelog.d/3987.misc
+++ b/changelog.d/3987.misc
@ -1 +0,0 @@
 Disable USE_FROZEN_DICTS for unittests by default.
--- a/changelog.d/3988.misc
+++ b/changelog.d/3988.misc
@ -1 +0,0 @@
 Remove unused Jenkins and development related files from the repo.
--- a/changelog.d/3989.misc
+++ b/changelog.d/3989.misc
@ -1 +0,0 @@
 Improve stacktraces in certain exceptions in the logs
--- a/changelog.d/3990.bugfix
+++ b/changelog.d/3990.bugfix
@ -1 +0,0 @@
 Fix error when logging incomplete HTTP requests
--- a/changelog.d/3991.bugfix
+++ b/changelog.d/3991.bugfix
@ -1 +0,0 @@
 Add a cache to get_destination_retry_timings
--- a/synapse/init.py
+++ b/synapse/init.py
@ -27,4 +27,4 @@ try:
 except ImportError:
    pass
-__version__ = "0.33.5.1"
+__version__ = "0.33.6"
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@ -58,7 +58,10 @@ REQUIREMENTS = {
    "msgpack-python>=0.3.0": ["msgpack"],
    "phonenumbers>=8.2.0": ["phonenumbers"],
    "six>=1.10": ["six"],
-    "prometheus_client>=0.0.18": ["prometheus_client"],
+
    # prometheus_client 0.4.0 changed the format of counter metrics
    # (cf https://github.com/matrix-org/synapse/issues/4001)
    "prometheus_client>=0.0.18,<0.4.0": ["prometheus_client"],
    # we use attr.s(slots), which arrived in 16.0.0
    "attrs>=16.0.0": ["attr>=16.0.0"],
		`@ -1 +0,0 @@`
			`Fix problem when playing media from Chrome using direct URL (thanks @remjey!)`
		`@ -1,2 +0,0 @@`
			`Unit tests can now be run under PostgreSQL in Docker using`
			``test_postgresql.sh``.
		`@ -1 +0,0 @@`
			`Speed up calculation of typing updates for replication`
		`@ -1 +0,0 @@`
			`support registering regular users non-interactively with register_new_matrix_user script`
		`@ -1 +0,0 @@`
			`Fix broken invite email links for self hosted riots`
		`@ -1,2 +0,0 @@`
			`Remove documentation regarding installation on Cygwin, the use of WSL is`
			`recommended instead.`
		`@ -1 +0,0 @@`
			`Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.`
		`@ -1 +0,0 @@`
			`Fix 500 error when deleting unknown room alias`
		`@ -1 +0,0 @@`
			`Report "python_version" in the phone home stats`
		`@ -1 +0,0 @@`
			`When we join a room, always try the server we used for the alias lookup first, to avoid unresponsive and out-of-date servers.`