Revert and back out release 2.4.0

Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>

CHANGELOG.md

@@ -1,38 +1,3 @@
-Sydent 2.4.0 (2021-08-25)
-=========================
-
-**Action required when upgrading**: server administrators should run [the case-folding migration script](./scripts/casefold_db.py). Sydent does not need to be stopped whilst running this script.
-
-Features
---------
-
-- Add support for using Jinja2 in e-mail templates. Contributed by H. Shay. ([\#376](https://github.com/matrix-org/sydent/issues/376))
-- Case-fold email addresses when binding to MXIDs or performing look-ups. Contributed by H. Shay. ([\#374](https://github.com/matrix-org/sydent/issues/374))
-
-
-Bugfixes
---------
-
-- Handle CORS for `GetValidated3pidServlet`. Endpoint `/3pid/getValidated3pid` returns valid CORS headers. ([\#342](https://github.com/matrix-org/sydent/issues/342))
-
-
-Internal Changes
-----------------
-
-- Reformat code using Black. Contributed by H. Shay. ([\#344](https://github.com/matrix-org/sydent/issues/344), [\#369](https://github.com/matrix-org/sydent/issues/369))
-- Configure Flake8 and resolve errors. ([\#345](https://github.com/matrix-org/sydent/issues/345), [\#347](https://github.com/matrix-org/sydent/issues/347))
-- Add GitHub Actions for unittests (Python 3.6 and 3.9), matrix_is_tester tests (Python 3.6 and 3.9), towncrier checks and black and flake8 codestyle checks. ([\#346](https://github.com/matrix-org/sydent/issues/346), [\#348](https://github.com/matrix-org/sydent/issues/348))
-- Remove support for Python < 3.6. ([\#349](https://github.com/matrix-org/sydent/issues/349), [\#356](https://github.com/matrix-org/sydent/issues/356))
-- Bump minimum supported version of Twisted to 18.4.0 and stop calling deprecated APIs. ([\#350](https://github.com/matrix-org/sydent/issues/350))
-- Replace deprecated `logging.warn()` method with `logging.warning()`. ([\#351](https://github.com/matrix-org/sydent/issues/351))
-- Reformat imports using isort. ([\#352](https://github.com/matrix-org/sydent/issues/352), [\#353](https://github.com/matrix-org/sydent/issues/353))
-- Update `.gitignore` to only ignore `sydent.conf` and `sydent.db` if they occur in the project's base folder. ([\#354](https://github.com/matrix-org/sydent/issues/354))
-- Add type hints and validate with mypy. ([\#355](https://github.com/matrix-org/sydent/issues/355), [\#357](https://github.com/matrix-org/sydent/issues/357), [\#358](https://github.com/matrix-org/sydent/issues/358), [\#360](https://github.com/matrix-org/sydent/issues/360), [\#361](https://github.com/matrix-org/sydent/issues/361), [\#367](https://github.com/matrix-org/sydent/issues/367), [\#371](https://github.com/matrix-org/sydent/issues/371))
-- Convert `inlineCallbacks` to async/await. ([\#364](https://github.com/matrix-org/sydent/issues/364), [\#365](https://github.com/matrix-org/sydent/issues/365), [\#368](https://github.com/matrix-org/sydent/issues/368), [\#372](https://github.com/matrix-org/sydent/issues/372), [\#373](https://github.com/matrix-org/sydent/issues/373))
-- Use `mock` module from the standard library. ([\#370](https://github.com/matrix-org/sydent/issues/370))
-- Fix email templates to be valid Python format strings. ([\#377](https://github.com/matrix-org/sydent/issues/377))
-
-
 Sydent 2.3.0 (2021-04-15)
 =========================
 

changelog.d/342.bugfix

@@ -0,0 +1 @@
+Handle CORS for `GetValidated3pidServlet`. Endpoint `/3pid/getValidated3pid` returns valid CORS headers.

changelog.d/343.misc

@@ -0,0 +1 @@
+Update black to 21.6b0. Contributed by H.Shay.

changelog.d/344.misc

@@ -0,0 +1 @@
+Configure Flake8 and resolve errors.

changelog.d/346.misc

@@ -0,0 +1 @@
+Add github actions for unittests (python 3.6 and 3.9), matrix_is_tester tests (python 3.6 and 3.9), towncrier checks and black and flake8 codestyle checks.

changelog.d/347.misc

@@ -0,0 +1 @@
+Configure Flake8 and resolve errors.

changelog.d/348.misc

@@ -0,0 +1 @@
+Add github actions for unittests (python 3.6 and 3.9), matrix_is_tester tests (python 3.6 and 3.9), towncrier checks and black and flake8 codestyle checks.

changelog.d/349.misc

@@ -0,0 +1 @@
+Remove support for Python < 3.6.

changelog.d/350.misc

@@ -0,0 +1 @@
+Bump minimum supported version of Twisted to 18.4.0 and stop calling deprecated APIs.

changelog.d/351.misc

@@ -0,0 +1 @@
+Replace deprecated `logging.warn()` method with `logging.warning()`.

changelog.d/352.misc

@@ -0,0 +1 @@
+Reformat imports using isort.

changelog.d/353.misc

@@ -0,0 +1 @@
+Reformat imports using isort.

changelog.d/354.misc

@@ -0,0 +1 @@
+Update `.gitignore` to only ignore `sydent.conf` and `sydent.db` if they occur in the project's base folder.

changelog.d/355.misc

@@ -0,0 +1 @@
+Add type hints and validate with mypy.

changelog.d/356.misc

@@ -0,0 +1 @@
+Remove support for Python < 3.6.

changelog.d/357.misc

@@ -0,0 +1 @@
+Add type hints and validate with mypy.

changelog.d/358.misc

@@ -0,0 +1 @@
+Add type hints and validate with mypy.

changelog.d/360.misc

@@ -0,0 +1 @@
+Add type hints and validate with mypy.

changelog.d/361.misc

@@ -0,0 +1 @@
+Add type hints and validate with mypy.

changelog.d/364.misc

@@ -0,0 +1 @@
+Convert `inlineCallbacks` to async/await.

changelog.d/365.misc

@@ -0,0 +1 @@
+Convert `inlineCallbacks` to async/await.

changelog.d/367.misc

@@ -0,0 +1 @@
+Add type hints and validate with mypy.

changelog.d/368.misc

@@ -0,0 +1 @@
+Convert `inlineCallbacks` to async/await.

changelog.d/369.misc

@@ -0,0 +1 @@
+Update black to 21.6b0. Contributed by H.Shay.

changelog.d/370.misc

@@ -0,0 +1 @@
+Use `mock` module from the standard library.

changelog.d/371.misc

@@ -0,0 +1 @@
+Add type hints and validate with mypy.

changelog.d/372.misc

@@ -0,0 +1 @@
+Convert `inlineCallbacks` to async/await.

changelog.d/373.misc

@@ -0,0 +1 @@
+Convert `inlineCallbacks` to async/await.

changelog.d/374.misc

@@ -0,0 +1 @@
+Case-fold email addresses when binding to MXIDs or performing look-ups. Contributed by H. Shay.

changelog.d/376.feature

@@ -0,0 +1 @@
+Add support for using Jinja2 in e-mail templates. Contributed by H-Shay.

changelog.d/377.misc

@@ -0,0 +1 @@
+Fix email templates to be valid python format strings.

sydent/__init__.py

@@ -1 +1 @@
-__version__ = "2.4.0"
+__version__ = "2.3.0"