From e1f8440c8959719a417fbf1bdda11406cfdf523d Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 21 Nov 2023 14:26:47 -0500 Subject: [PATCH 1/2] Update the README pointing to the Element fork. --- README.rst | 12 ++++++++---- synapse/__init__.py | 6 ++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 4a90429647..85d4a26352 100644 --- a/README.rst +++ b/README.rst @@ -2,10 +2,14 @@ Synapse |support| |development| |documentation| |license| |pypi| |python| ========================================================================= -Synapse is an open-source `Matrix `_ homeserver written and -maintained by the Matrix.org Foundation. We began rapid development in 2014, -reaching v1.0.0 in 2019. Development on Synapse and the Matrix protocol itself continues -in earnest today. +Synapse is now actively maintained at `vector-im/synapse `_ +================================================================================================= + +Synapse is an open-source `Matrix `_ homeserver developed +from 2014 through 2023 as part of the Matrix.org Foundation. The Matrix.org +Foundation is not able to resource maintenance of Synapse and it +`continues to be developed by Element `_; +additionally you have the choice of `other Matrix homeservers `_. Briefly, Matrix is an open standard for communications on the internet, supporting federation, encryption and VoIP. Matrix.org has more to say about the `goals of the diff --git a/synapse/__init__.py b/synapse/__init__.py index 4a9bbc4d57..25928a60d2 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -29,6 +29,12 @@ from synapse.util.stringutils import strtobool # Allow truncated JPEG images to be thumbnailed. ImageFile.LOAD_TRUNCATED_IMAGES = True +# Update your remotes folks. +print("Synapse is no longer being developed under the matrix-org organization.") +print("Please update your git remote to pull from vector-im/synapse:") +print(" git remote set-url origin git@github.com:vector-im/synapse.git") +sys.exit(1) + # Check that we're not running on an unsupported Python version. # # Note that we use an (unneeded) variable here so that pyupgrade doesn't nuke the From 70c020b532821f898aaa07c35c5d5ab59055ae1c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 12 Dec 2023 20:32:48 +0000 Subject: [PATCH 2/2] Update text --- README.rst | 9 ++++++--- synapse/__init__.py | 12 +++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 85d4a26352..e0fdce3619 100644 --- a/README.rst +++ b/README.rst @@ -2,15 +2,18 @@ Synapse |support| |development| |documentation| |license| |pypi| |python| ========================================================================= -Synapse is now actively maintained at `vector-im/synapse `_ +Synapse is now actively maintained at `vector-im/synapse `_ ================================================================================================= Synapse is an open-source `Matrix `_ homeserver developed -from 2014 through 2023 as part of the Matrix.org Foundation. The Matrix.org +from 2019 through 2023 as part of the Matrix.org Foundation. The Matrix.org Foundation is not able to resource maintenance of Synapse and it -`continues to be developed by Element `_; +`continues to be developed by Element `_; additionally you have the choice of `other Matrix homeservers `_. +See `The future of Synapse and Dendrite `_ +blog post for more information. + Briefly, Matrix is an open standard for communications on the internet, supporting federation, encryption and VoIP. Matrix.org has more to say about the `goals of the Matrix project `_, and the `formal specification diff --git a/synapse/__init__.py b/synapse/__init__.py index 25928a60d2..e21ba6e186 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -30,9 +30,15 @@ from synapse.util.stringutils import strtobool ImageFile.LOAD_TRUNCATED_IMAGES = True # Update your remotes folks. -print("Synapse is no longer being developed under the matrix-org organization.") -print("Please update your git remote to pull from vector-im/synapse:") -print(" git remote set-url origin git@github.com:vector-im/synapse.git") +announcement = """ +Synapse is no longer being developed under the matrix-org organization. See the +README.rst for more details. + +Please update your git remote to pull from element-hq/synapse: + + git remote set-url origin git@github.com:element-hq/synapse.git +""" +print(announcement) sys.exit(1) # Check that we're not running on an unsupported Python version.