Merge branch 'release-v2.5'

.github/workflows/publish.yml

@@ -2,7 +2,6 @@ name: "Build and upload to PyPI"
 on:
   release:
     types: ["published"]
-  workflow_dispatch:
 
 jobs:
   upload:

CHANGELOG.md

@@ -1,3 +1,41 @@
+Sydent 2.5.2 (2022-04-04)
+=========================
+
+This release of Sydent is the first to use `poetry` to maintain a locked set of dependency versions. The use of `poetry` is optional: administrators can continue to install from a wheel or using their own virtualenv.
+
+Bugfixes
+--------
+
+- Fix a bug where federation requests would fail early if a `.well-known/matrix/server` response contains an invalid type for `m.server`. Instead, try finding an SRV record, as mandated by [the spec](https://spec.matrix.org/v1.1/server-server-api/#resolving-server-names). ([\#473](https://github.com/matrix-org/sydent/issues/473))
+- Fix a bug in the casefolding script that would cause some deletions to be skipped if e-mail sending was enabled. ([\#489](https://github.com/matrix-org/sydent/issues/489))
+- Fix a bug introduced in Sydent 2.4.6 where errors communicating with OpenMarket's SMS API would be logged as successes, and all successes would be logged twice. ([\#490](https://github.com/matrix-org/sydent/issues/490))
+
+
+Improved Documentation
+----------------------
+
+- Added a link to [`#sydent:matrix.org`](https://matrix.to/#/#sydent:matrix.org) in the README so users know where to discuss sydent. Contributed by @clmnin. ([\#479](https://github.com/matrix-org/sydent/issues/479))
+
+
+Internal Changes
+----------------
+
+- Add a test to ensure that a bad response from the OpenMarket SMS API raises an exception. ([\#471](https://github.com/matrix-org/sydent/issues/471))
+- Add missing dependencies to `setup.py`. ([\#474](https://github.com/matrix-org/sydent/issues/474))
+- Cache the lookup pepper in the `HashingMetadataStore`. ([\#475](https://github.com/matrix-org/sydent/issues/475), [\#477](https://github.com/matrix-org/sydent/issues/477))
+- Update type annotations to ensure Sydent typechecks with recent mypy versions. ([\#481](https://github.com/matrix-org/sydent/issues/481))
+- Fix type errors caused by an update to PyNaCl. ([\#484](https://github.com/matrix-org/sydent/issues/484))
+- Add aggressive logging to `casefoldb.py` for debugging purposes. ([\#486](https://github.com/matrix-org/sydent/issues/486))
+- Use poetry to manage dependencies. ([\#488](https://github.com/matrix-org/sydent/issues/488))
+- Build and publish a docker image on the `main` branch and tagged releases. ([\#492](https://github.com/matrix-org/sydent/issues/492))
+- Update Dockerfile to use a fixed poetry environment, rather than `pip install`ing the latest dependencies. ([\#493](https://github.com/matrix-org/sydent/issues/493))
+- Bump twisted from 21.7.0 to 22.1.0. ([\#495](https://github.com/matrix-org/sydent/issues/495))
+- Use matrix-common util to get a git-aware version number. ([\#497](https://github.com/matrix-org/sydent/issues/497))
+- Publish releases to PyPI using GitHub Actions. ([\#499](https://github.com/matrix-org/sydent/issues/499))
+- Mark `sentry-sdk` and `prometheus-client` as optional dependencies. ([\#501](https://github.com/matrix-org/sydent/issues/501))
+- Add poetry entrypoint for running sydent. ([\#502](https://github.com/matrix-org/sydent/issues/502))
+
+
 Sydent 2.5.1 (2021-11-17)
 =========================
 

changelog.d/471.misc

@@ -1 +0,0 @@
-Add a test to ensure that a bad response from the open market api raises an exception.

changelog.d/473.bugfix

@@ -1 +0,0 @@
-Fix a bug where federation requests would fail early if a `.well-known/matrix/server` response contains an invalid type for `m.server`. Instead, try finding an SRV record, as mandated by [the spec](https://spec.matrix.org/v1.1/server-server-api/#resolving-server-names).

changelog.d/474.misc

@@ -1 +0,0 @@
-Add missing dependencies to `setup.py`.

changelog.d/475.misc

@@ -1 +0,0 @@
-Cache the lookup pepper in the `HashingMetadataStore`.

changelog.d/477.misc

@@ -1 +0,0 @@
-Cache the lookup pepper in the `HashingMetadataStore`.

changelog.d/479.doc

@@ -1 +0,0 @@
-Added a link to `#sydent:matrix.org` in the README so users know where to discuss sydent. Contributed by @clmnin.

changelog.d/481.misc

@@ -1 +0,0 @@
-Update type annotations to ensure Sydent typechecks with recent mypy versions.

changelog.d/484.misc

@@ -1 +0,0 @@
-Fix type errors caused by an update to PyNaCl.

changelog.d/486.misc

@@ -1 +0,0 @@
-Add aggressive logging to `casefoldb.py` for debugging purposes.

changelog.d/488.misc

@@ -1 +0,0 @@
-Use poetry to manage dependencies.

changelog.d/489.bugfix

@@ -1 +0,0 @@
-Fix bug in the casefolding script that would cause some deletions to be skipped if e-mail sending was enabled.

changelog.d/490.bugfix

@@ -1 +0,0 @@
-Fix a bug introduced in Sydent 2.4.6 where errors communicating with openmarket would be logged as successes, and all successes would be logged twice.

changelog.d/492.misc

@@ -1 +0,0 @@
-Build and publish a docker image on the `main` branch and tagged releases.

changelog.d/493.misc

@@ -1 +0,0 @@
-Update Dockerfile to use a fixed poetry environment, rather than `pip install`ing the latest dependencies.

changelog.d/495.misc

@@ -1 +0,0 @@
-Bump twisted from 21.7.0 to 22.1.0.

changelog.d/497.misc

@@ -1 +0,0 @@
-Use matrix-common util to get a git-aware version number.

changelog.d/499.misc

@@ -1 +0,0 @@
-Publish releases to PyPI using GitHub Actions.

changelog.d/501.misc

@@ -1 +0,0 @@
-Mark `sentry-sdk` and `prometheus-client` as optional dependencies.

changelog.d/502.misc

@@ -1 +0,0 @@
-Add poetry entrypoint for running sydent.

poetry.lock

@@ -113,6 +113,17 @@ python-versions = ">=3.6"
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
 importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
 
+[[package]]
+name = "click-default-group"
+version = "1.2.2"
+description = "Extends click.Group to invoke a command without explicit subcommand name"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+click = "*"
+
 [[package]]
 name = "colorama"
 version = "0.4.4"
@@ -614,6 +625,24 @@ category = "dev"
 optional = false
 python-versions = ">=3.7"
 
+[[package]]
+name = "towncrier"
+version = "21.9.0"
+description = "Building newsfiles for your project."
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+click = "*"
+click-default-group = "*"
+incremental = "*"
+jinja2 = "*"
+tomli = {version = "*", markers = "python_version >= \"3.6\""}
+
+[package.extras]
+dev = ["packaging"]
+
 [[package]]
 name = "twisted"
 version = "22.2.0"
@@ -826,7 +855,7 @@ sentry = ["sentry-sdk"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "e51aba344b29123f99e894a64d0f1e89082568d1099ce81834eac2e65c7e6d48"
+content-hash = "e33328ef874fd6ee5bec45d3c95fb52ca0b3194f9e19e1096359bb010441f98d"
 
 [metadata.files]
 appdirs = [
@@ -913,6 +942,9 @@ click = [
     {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
     {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"},
 ]
+click-default-group = [
+    {file = "click-default-group-1.2.2.tar.gz", hash = "sha256:d9560e8e8dfa44b3562fbc9425042a0fd6d21956fcc2db0077f63f34253ab904"},
+]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
     {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
@@ -955,6 +987,9 @@ frozendict = [
     {file = "frozendict-2.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b39cfcf563b3432d4780bf15769e2de2a2906c46c26fb73a9582b69142621814"},
     {file = "frozendict-2.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7198dda9741f3da79db952ecd27607d836727ed320f29438eac565133008c8c"},
     {file = "frozendict-2.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:3a564bd93767044e740e0f6c59606cf612a143160ace9d2c047c4a297a74329a"},
+    {file = "frozendict-2.2.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:2a47f3f7fe52094904777d29f300ad6c11213dd81a8fbdec96aa2d4763104319"},
+    {file = "frozendict-2.2.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bfacb9f75768903495747ddaacb1bf98738fb3e966a27f0627f7f163fd676eb"},
+    {file = "frozendict-2.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:efc138fb1e2c115c39240f60b4b0daf752f1cca591d5f93ac4e788af0665d737"},
     {file = "frozendict-2.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:722e915421b2d869b236d8de8e0ab42f1e2f7e12d670f9bc3dedfc055550bcb9"},
     {file = "frozendict-2.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4519f6eb661f268c60a3ea14f000d321159cf5e6db397129ea4921aef3bf2173"},
     {file = "frozendict-2.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9c720e4a19e9b5f48d1b12e193d39765898dff4952320251c0ccd9960631cae9"},
@@ -1384,6 +1419,10 @@ tomli = [
     {file = "tomli-2.0.0-py3-none-any.whl", hash = "sha256:b5bde28da1fed24b9bd1d4d2b8cba62300bfb4ec9a6187a957e8ddb9434c5224"},
     {file = "tomli-2.0.0.tar.gz", hash = "sha256:c292c34f58502a1eb2bbb9f5bbc9a5ebc37bee10ffb8c2d6bbdfa8eb13cc14e1"},
 ]
+towncrier = [
+    {file = "towncrier-21.9.0-py2.py3-none-any.whl", hash = "sha256:fc5a88a2a54988e3a8ed2b60d553599da8330f65722cc607c839614ed87e0f92"},
+    {file = "towncrier-21.9.0.tar.gz", hash = "sha256:9cb6f45c16e1a1eec9d0e7651165e7be60cd0ab81d13a5c96ca97a498ae87f48"},
+]
 twisted = [
     {file = "Twisted-22.2.0-py3-none-any.whl", hash = "sha256:5c63c149eb6b8fe1e32a0215b1cef96fabdba04f705d8efb9174b1ccf5b49d49"},
     {file = "Twisted-22.2.0.tar.gz", hash = "sha256:57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2"},

pyproject.toml

@@ -70,7 +70,7 @@ ignore_missing_imports = true
 
 [tool.poetry]
 name = "matrix-sydent"
-version = "2.5.1"
+version = "2.5.2"
 description = "Reference Matrix Identity Verification and Lookup Server"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"
@@ -131,6 +131,7 @@ types-Jinja2 = "2.11.9"
 types-mock = "4.0.8"
 types-PyOpenSSL = "21.0.3"
 types-PyYAML = "6.0.3"
+towncrier = "^21.9.0"
 
 [tool.poetry.extras]
 sentry = ["sentry-sdk"]