DMRobertson · April 4, 2022 17:30
diff --git a/compare-builds.sh b/compare-builds.sh
 #! /usr/bin/env bash

 # This script compares the wheels and sdists for Synapse built using poetry and using existing tooling.
 # See https://github.com/matrix-org/synapse/pull/12337 and https://github.com/matrix-org/synapse/issues/11537. 

 set -xeuo pipefail

 git switch dmr/pyproject-poetry
 POETRY_BRANCH_VERSION=$(poetry version -s)
 python -m build --outdir dist-poetry
 unzip -d dist-poetry/wheel "dist-poetry/matrix_synapse-$POETRY_BRANCH_VERSION-py3-none-any.whl"
 mkdir -p dist-poetry/sdist
 tar -xzf "dist-poetry/matrix-synapse-$POETRY_BRANCH_VERSION.tar.gz" -C dist-poetry/sdist

 COMMON_ANCESTOR_COMMIT=$(git merge-base develop dmr/pyproject-poetry)
 git checkout "$COMMON_ANCESTOR_COMMIT"
 SYNAPSE_DEVELOP_VERSION=$(python -c 'import synapse; print(synapse.__version__)')

 if [ "$POETRY_BRANCH_VERSION" != "$SYNAPSE_DEVELOP_VERSION" ]; then
    echo "Project versions differ: poetry=$POETRY_BRANCH_VERSION, setuptools=$SYNAPSE_DEVELOP_VERSION" > /dev/stderr
    exit 1
 fi

 python -m build --outdir dist-setuptools
 unzip -d dist-setuptools/wheel "dist-setuptools/matrix_synapse-$SYNAPSE_DEVELOP_VERSION-py3-none-any.whl"
 mkdir -p dist-setuptools/sdist
 tar -xzf "dist-setuptools/matrix-synapse-$SYNAPSE_DEVELOP_VERSION.tar.gz" -C dist-setuptools/sdist

 diff -ru dist-{setuptools,poetry}/wheel > wheel.diff || true
 diff -ru dist-{setuptools,poetry}/sdist > sdist.diff || true

 # To clean up:
 # rm -r dist{setuptools,poetry}
 # rm {wheel,sdist}.diff
diff --git a/sdist.diff b/sdist.diff
 Only in dist-poetry/sdist/matrix-synapse-1.55.2/changelog.d: 12337.feature
 Only in dist-poetry/sdist/matrix-synapse-1.55.2/demo: .gitignore
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/docs/code_style.md dist-poetry/sdist/matrix-synapse-1.55.2/docs/code_style.md
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/docs/code_style.md	2022-04-04 18:23:17.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/docs/code_style.md	2022-04-04 18:21:37.138492600 +0100
 @@ -6,13 +6,8 @@
 quickly and automatically check for formatting (and sometimes logical)
 errors in code.
 
 -The necessary tools are detailed below.
 -
 -First install them with:
 -
 -```sh
 -pip install -e ".[lint,mypy]"
 -```
 +The necessary tools are detailed below. They should be installed by poetry as part
 +of Synapse's dev dependencies. See [the contributing guide](https://matrix-org.github.io/synapse/develop/development/contributing_guide.html#4-install-the-dependencies) for instructions.
 
 -   **black**
 
 @@ -24,7 +19,7 @@
     functionality) with:
 
     ```sh
 -    black . --exclude="\.tox|build|env"
 +    black .
     ```
 
 -   **flake8**
 @@ -35,7 +30,7 @@
     Check all application and test code with:
 
     ```sh
 -    flake8 synapse tests
 +    flake8 .
     ```
 
 -   **isort**
 @@ -46,11 +41,9 @@
     Auto-fix imports with:
 
     ```sh
 -    isort -rc synapse tests
 +    isort .
     ```
 
 -    `-rc` means to recursively search the given directories.
 -
 It's worth noting that modern IDEs and text editors can run these tools
 automatically on save. It may be worth looking into whether this
 functionality is supported in your editor for a more convenient
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/docs/development/contributing_guide.md dist-poetry/sdist/matrix-synapse-1.55.2/docs/development/contributing_guide.md
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/docs/development/contributing_guide.md	2022-04-04 18:23:17.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/docs/development/contributing_guide.md	2022-04-04 18:21:37.138492600 +0100
 @@ -48,16 +48,16 @@
 
 # 4. Install the dependencies
 
 -Once you have installed Python 3 and added the source, please open a terminal and
 -setup a *virtualenv*, as follows:
 +Synapse uses the [poetry](https://python-poetry.org/) project to manage its dependencies
 +and development environment. Once you have installed Python 3 and added the
 +source, you should [install poetry](https://python-poetry.org/docs/#installation).
 +We recommend installing `poetry` using `pipx`; see their instructions for details.
 +
 +Next, open a terminal and install dependencies as follows:
 
 ```sh
 cd path/where/you/have/cloned/the/repository
 -python3 -m venv ./env
 -source ./env/bin/activate
 -pip install wheel
 -pip install -e ".[all,dev]"
 -pip install tox
 +poetry install --extras "all test"
 ```
 
 This will install the developer dependencies for the project.
 @@ -117,11 +117,10 @@
 - ensure that your code follows the coding style adopted by the project;
 - catch a number of errors in your code.
 
 -The linter takes no time at all to run as soon as you've [downloaded the dependencies into your python virtual environment](#4-install-the-dependencies).
 +The linter takes no time at all to run as soon as you've [downloaded the dependencies](#4-install-the-dependencies).
 
 ```sh
 -source ./env/bin/activate
 -./scripts-dev/lint.sh
 +poetry run ./scripts-dev/lint.sh
 ```
 
 Note that this script *will modify your files* to fix styling errors.
 @@ -131,15 +130,13 @@
 (much faster!), you can instead run:
 
 ```sh
 -source ./env/bin/activate
 -./scripts-dev/lint.sh -d
 +poetry run ./scripts-dev/lint.sh -d
 ```
 
 Or if you know exactly which files you wish to lint, you can instead run:
 
 ```sh
 -source ./env/bin/activate
 -./scripts-dev/lint.sh path/to/file1.py path/to/file2.py path/to/folder
 +poetry run ./scripts-dev/lint.sh path/to/file1.py path/to/file2.py path/to/folder
 ```
 
 ## Run the unit tests (Twisted trial).
 @@ -148,16 +145,14 @@
 was broken. They are slower than the linters but will typically catch more errors.
 
 ```sh
 -source ./env/bin/activate
 -trial tests
 +poetry run trial tests
 ```
 
 If you wish to only run *some* unit tests, you may specify
 another module instead of `tests` - or a test class or a method:
 
 ```sh
 -source ./env/bin/activate
 -trial tests.rest.admin.test_room tests.handlers.test_admin.ExfiltrateData.test_invite
 +poetry run trial tests.rest.admin.test_room tests.handlers.test_admin.ExfiltrateData.test_invite
 ```
 
 If your tests fail, you may wish to look at the logs (the default log level is `ERROR`):
 @@ -169,7 +164,7 @@
 To increase the log level for the tests, set `SYNAPSE_TEST_LOG_LEVEL`:
 
 ```sh
 -SYNAPSE_TEST_LOG_LEVEL=DEBUG trial tests
 +SYNAPSE_TEST_LOG_LEVEL=DEBUG poetry run trial tests
 ```
 
 By default, tests will use an in-memory SQLite database for test data. For additional
 @@ -180,7 +175,7 @@
 working directory. Typically, this ends up being `_trial_temp/test.db`. For example:
 
 ```sh
 -SYNAPSE_TEST_PERSIST_SQLITE_DB=1 trial tests
 +SYNAPSE_TEST_PERSIST_SQLITE_DB=1 poetry run trial tests
 ```
 
 The database file can then be inspected with:
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/docs/upgrade.md dist-poetry/sdist/matrix-synapse-1.55.2/docs/upgrade.md
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/docs/upgrade.md	2022-04-04 18:23:17.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/docs/upgrade.md	2022-04-04 18:21:37.139492800 +0100
 @@ -19,32 +19,35 @@
     packages](setup/installation.md#prebuilt-packages), you will need to follow the
     normal process for upgrading those packages.
 
 +-   If Synapse was installed using pip then upgrade to the latest
 +    version by running:
 +
 +    ```bash
 +    pip install --upgrade matrix-synapse
 +    ```
 +
 -   If Synapse was installed from source, then:
 
 -    1.  Activate the virtualenv before upgrading. For example, if
 -        Synapse is installed in a virtualenv in `~/synapse/env` then
 +    1.  Obtain the latest version of the source code. Git users can run
 +        `git pull` to do this.
 +
 +    2.  If you're running Synapse in a virtualenv, make sure to activate it before
 +        upgrading. For example, if Synapse is installed in a virtualenv in `~/synapse/env` then
         run:
 
         ```bash
         source ~/synapse/env/bin/activate
 +        pip install --upgrade .
         ```
 +        Include any relevant extras between square brackets, e.g. `pip install --upgrade .[postgres,oidc]`.
 
 -    2.  If Synapse was installed using pip then upgrade to the latest
 -        version by running:
 -
 -        ```bash
 -        pip install --upgrade matrix-synapse
 -        ```
 -
 -        If Synapse was installed using git then upgrade to the latest
 -        version by running:
 -
 +    3.  If you're using `poetry` to manage a Synapse installation, run:
         ```bash
 -        git pull
 -        pip install --upgrade .
 +        poetry install
         ```
 +        Include any relevant extras with `--extras`, e.g. `poetry install --extras "postgres oidc"`. 
 
 -    3.  Restart Synapse:
 +    4.  Restart Synapse:
 
         ```bash
         synctl restart
 Only in dist-setuptools/sdist/matrix-synapse-1.55.2: .flake8
 Only in dist-setuptools/sdist/matrix-synapse-1.55.2: MANIFEST.in
 Only in dist-setuptools/sdist/matrix-synapse-1.55.2: matrix_synapse.egg-info
 Only in dist-poetry/sdist/matrix-synapse-1.55.2: mypy.ini
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/PKG-INFO dist-poetry/sdist/matrix-synapse-1.55.2/PKG-INFO
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/PKG-INFO	2022-04-04 18:23:23.956710300 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/PKG-INFO	2022-04-04 18:23:13.585370500 +0100
 @@ -1,37 +1,82 @@
 Metadata-Version: 2.1
 Name: matrix-synapse
 Version: 1.55.2
 -Summary: Reference homeserver for the Matrix decentralised comms protocol
 -License: UNKNOWN
 -Platform: UNKNOWN
 +Summary: Homeserver for the Matrix decentralised comms protocol
 +Home-page: https://github.com/matrix-org/synapse
 +License: Apache-2.0
 +Author: Matrix.org Team and Contributors
 +Author-email: [email protected]
 +Requires-Python: >=3.7,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 -Classifier: Topic :: Communications :: Chat
 Classifier: License :: OSI Approved :: Apache Software License
 -Classifier: Programming Language :: Python :: 3 :: Only
 +Classifier: Programming Language :: Python :: 3
 +Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 -Classifier: Programming Language :: Python :: 3.10
 -Requires-Python: ~=3.7
 -Description-Content-Type: text/x-rst
 +Classifier: Topic :: Communications :: Chat
 +Provides-Extra: all
 +Provides-Extra: cache_memory
 +Provides-Extra: jwt
 Provides-Extra: matrix-synapse-ldap3
 -Provides-Extra: postgres
 -Provides-Extra: saml2
 Provides-Extra: oidc
 -Provides-Extra: systemd
 -Provides-Extra: url_preview
 -Provides-Extra: sentry
 Provides-Extra: opentracing
 -Provides-Extra: jwt
 +Provides-Extra: postgres
 Provides-Extra: redis
 -Provides-Extra: cache_memory
 -Provides-Extra: all
 -Provides-Extra: lint
 -Provides-Extra: mypy
 +Provides-Extra: saml2
 +Provides-Extra: sentry
 +Provides-Extra: systemd
 Provides-Extra: test
 -Provides-Extra: dev
 -License-File: LICENSE
 -License-File: AUTHORS.rst
 +Provides-Extra: url_preview
 +Requires-Dist: Jinja2 (>=3.0)
 +Requires-Dist: Pillow (>=5.4.0)
 +Requires-Dist: PyNaCl (>=1.2.1)
 +Requires-Dist: PyYAML (>=3.11)
 +Requires-Dist: Pympler; extra == "cache_memory"
 +Requires-Dist: Twisted (>=18.9.0)
 +Requires-Dist: attrs (>=19.2.0,!=21.1.0)
 +Requires-Dist: authlib (>=0.14.0); extra == "oidc" or extra == "all"
 +Requires-Dist: bcrypt (>=3.1.0)
 +Requires-Dist: bleach (>=1.4.3)
 +Requires-Dist: canonicaljson (>=1.4.0)
 +Requires-Dist: cryptography (>=3.4.7)
 +Requires-Dist: frozendict (>=1,!=2.1.2)
 +Requires-Dist: hiredis; extra == "redis" or extra == "all"
 +Requires-Dist: idna (>=2.5)
 +Requires-Dist: ijson (>=3.1.4)
 +Requires-Dist: importlib_metadata (>=1.4); python_version < "3.8"
 +Requires-Dist: jaeger-client (>=4.0.0); extra == "opentracing" or extra == "all"
 +Requires-Dist: jsonschema (>=3.0.0)
 +Requires-Dist: lxml (>=4.2.0); extra == "url_preview" or extra == "all"
 +Requires-Dist: matrix-common (>=1.1.0,<1.2.0)
 +Requires-Dist: matrix-synapse-ldap3 (>=0.1); extra == "matrix-synapse-ldap3" or extra == "all"
 +Requires-Dist: msgpack (>=0.5.2)
 +Requires-Dist: netaddr (>=0.7.18)
 +Requires-Dist: opentracing (>=2.2.0); extra == "opentracing" or extra == "all"
 +Requires-Dist: packaging (>=16.1)
 +Requires-Dist: parameterized (>=0.7.4); extra == "test"
 +Requires-Dist: phonenumbers (>=8.2.0)
 +Requires-Dist: prometheus-client (>=0.4.0)
 +Requires-Dist: psycopg2 (>=2.8); (platform_python_implementation != "PyPy") and (extra == "postgres" or extra == "all")
 +Requires-Dist: psycopg2cffi (>=2.8); (platform_python_implementation == "PyPy") and (extra == "postgres" or extra == "all")
 +Requires-Dist: psycopg2cffi-compat (==1.1); (platform_python_implementation == "PyPy") and (extra == "postgres" or extra == "all")
 +Requires-Dist: pyOpenSSL (>=16.0.0)
 +Requires-Dist: pyasn1 (>=0.1.9)
 +Requires-Dist: pyasn1-modules (>=0.0.7)
 +Requires-Dist: pyjwt (>=1.6.4); extra == "jwt" or extra == "all"
 +Requires-Dist: pymacaroons (>=0.13.0)
 +Requires-Dist: pysaml2 (>=4.5.0); extra == "saml2" or extra == "all"
 +Requires-Dist: sentry-sdk (>=0.7.2); extra == "sentry" or extra == "all"
 +Requires-Dist: service-identity (>=18.1.0)
 +Requires-Dist: signedjson (>=1.1.0)
 +Requires-Dist: sortedcontainers (>=1.4.4)
 +Requires-Dist: systemd-python (>=231); extra == "systemd"
 +Requires-Dist: treq (>=15.1)
 +Requires-Dist: txredisapi (>=1.4.7); extra == "redis" or extra == "all"
 +Requires-Dist: typing-extensions (>=3.10.0)
 +Requires-Dist: unpaddedbase64 (>=2.1.0)
 +Project-URL: Repository, https://github.com/matrix-org/synapse
 +Description-Content-Type: text/x-rst
 
 =========================================================================
 Synapse |support| |development| |documentation| |license| |pypi| |python|
 @@ -328,24 +373,26 @@
     git clone https://github.com/matrix-org/synapse.git
     cd synapse
 
 -Synapse has a number of external dependencies, that are easiest
 -to install using pip and a virtualenv::
 +Synapse has a number of external dependencies. We maintain a fixed development
 +environment using [poetry](https://python-poetry.org/). First, install poetry. We recommend
 
 -    python3 -m venv ./env
 -    source ./env/bin/activate
 -    pip install -e ".[all,dev]"
 +    pip install --user pipx
 +    pipx install poetry
 
 -This will run a process of downloading and installing all the needed
 -dependencies into a virtual env. If any dependencies fail to install,
 -try installing the failing modules individually::
 +but see the `poetry installation docs <https://python-poetry.org/docs/#installation>`_
 +for more details. Then ask poetry to create a virtual environment from the project
 +and install Synapse's dependencies::
 
 -    pip install -e "module-name"
 +    poetry install --extras "all test"
 +
 +This will run a process of downloading and installing all the needed
 +dependencies into a virtual env.
 
 We recommend using the demo which starts 3 federated instances running on ports `8080` - `8082`
 
 -    ./demo/start.sh
 +    poetry run ./demo/start.sh
 
 -(to stop, you can use `./demo/stop.sh`)
 +(to stop, you can use `poetry run ./demo/stop.sh`)
 
 See the [demo documentation](https://matrix-org.github.io/synapse/develop/development/demo.html)
 for more information.
 @@ -353,14 +400,14 @@
 If you just want to start a single instance of the app and run it directly::
 
     # Create the homeserver.yaml config once
 -    python -m synapse.app.homeserver \
 +    poetry run synapse_homeserver \
       --server-name my.domain.name \
       --config-path homeserver.yaml \
       --generate-config \
       --report-stats=[yes|no]
 
     # Start the app
 -    python -m synapse.app.homeserver --config-path homeserver.yaml
 +    poetry run synapse_homeserver --config-path homeserver.yaml
 
 
 Running the unit tests
 @@ -369,7 +416,7 @@
 After getting up and running, you may wish to run Synapse's unit tests to
 check that everything is installed correctly::
 
 -    trial tests
 +    poetry run trial tests
 
 This should end with a 'PASSED' result (note that exact numbers will
 differ)::
 @@ -517,4 +564,3 @@
   :alt: (supported python versions)
   :target: https://pypi.org/project/matrix-synapse
 
 -
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/pyproject.toml dist-poetry/sdist/matrix-synapse-1.55.2/pyproject.toml
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/pyproject.toml	2022-04-04 18:23:17.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/pyproject.toml	2022-04-04 18:21:46.008510800 +0100
 @@ -36,24 +36,9 @@
 
 [tool.black]
 target-version = ['py37', 'py38', 'py39', 'py310']
 -exclude = '''
 -
 -(
 -  /(
 -      \.eggs         # exclude a few common directories in the
 -    | \.git          # root of the project
 -    | \.tox
 -    | \.venv
 -    | \.env
 -    | env
 -    | _build
 -    | _trial_temp.*
 -    | build
 -    | dist
 -    | debian
 -  )/
 -)
 -'''
 +# black ignores everything in .gitignore by default, see
 +# https://black.readthedocs.io/en/stable/usage_and_configuration/file_collection_and_discovery.html#gitignore
 +# Use `extend-exclude` if you want to exclude something in addition to this.
 
 [tool.isort]
 line_length = 88
 @@ -65,4 +50,234 @@
 multi_line_output = 3
 include_trailing_comma = true
 combine_as_imports = true
 +skip_gitignore = true
 +
 +[tool.poetry]
 +name = "matrix-synapse"
 +version = "1.55.2"
 +description = "Homeserver for the Matrix decentralised comms protocol"
 +authors = ["Matrix.org Team and Contributors <[email protected]>"]
 +license = "Apache-2.0"
 +readme = "README.rst"
 +repository = "https://github.com/matrix-org/synapse"
 +packages = [
 +    { include = "synapse" },
 +]
 +classifiers = [
 +    "Development Status :: 5 - Production/Stable",
 +    "Topic :: Communications :: Chat",
 +]
 +include = [
 +    { path = "AUTHORS.rst", format = "sdist" },
 +    { path = "book.toml", format = "sdist" },
 +    { path = "changelog.d", format = "sdist" },
 +    { path = "CHANGES.md", format = "sdist" },
 +    { path = "CONTRIBUTING.md", format = "sdist" },
 +    { path = "demo", format = "sdist" },
 +    { path = "docs", format = "sdist" },
 +    { path = "INSTALL.md", format = "sdist" },
 +    { path = "mypy.ini", format = "sdist" },
 +    { path = "scripts-dev", format = "sdist" },
 +    { path = "synmark", format="sdist" },
 +    { path = "sytest-blacklist", format = "sdist" },
 +    { path = "tests", format = "sdist" },
 +    { path = "UPGRADE.rst", format = "sdist" },
 +]
 +
 +[tool.poetry.scripts]
 +synapse_homeserver = "synapse.app.homeserver:main"
 +synapse_worker = "synapse.app.generic_worker:main"
 +synctl = "synapse._scripts.synctl:main"
 +
 +export_signing_key = "synapse._scripts.export_signing_key:main"
 +generate_config = "synapse._scripts.generate_config:main"
 +generate_log_config = "synapse._scripts.generate_log_config:main"
 +generate_signing_key = "synapse._scripts.generate_signing_key:main"
 +hash_password = "synapse._scripts.hash_password:main"
 +register_new_matrix_user = "synapse._scripts.register_new_matrix_user:main"
 +synapse_port_db = "synapse._scripts.synapse_port_db:main"
 +synapse_review_recent_signups = "synapse._scripts.review_recent_signups:main"
 +update_synapse_database = "synapse._scripts.update_synapse_database:main"
 +
 +[tool.poetry.dependencies]
 +python = "^3.7"
 +
 +# Mandatory Dependencies
 +# ----------------------
 +# we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0
 +jsonschema = ">=3.0.0"
 +# frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41
 +frozendict = ">=1,!=2.1.2"
 +# We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0
 +unpaddedbase64 = ">=2.1.0"
 +canonicaljson = ">=1.4.0"
 +# we use the type definitions added in signedjson 1.1.
 +signedjson = ">=1.1.0"
 +PyNaCl = ">=1.2.1"
 +idna = ">=2.5"
 +# validating SSL certs for IP addresses requires service_identity 18.1.
 +service-identity = ">=18.1.0"
 +# Twisted 18.9 introduces some logger improvements that the structured
 +# logger utilises
 +Twisted = ">=18.9.0"
 +treq = ">=15.1"
 +# Twisted has required pyopenssl 16.0 since about Twisted 16.6.
 +pyOpenSSL = ">=16.0.0"
 +PyYAML = ">=3.11"
 +pyasn1 = ">=0.1.9"
 +pyasn1-modules = ">=0.0.7"
 +bcrypt = ">=3.1.0"
 +Pillow = ">=5.4.0"
 +sortedcontainers = ">=1.4.4"
 +pymacaroons = ">=0.13.0"
 +msgpack = ">=0.5.2"
 +phonenumbers = ">=8.2.0"
 +# we use GaugeHistogramMetric, which was added in prom-client 0.4.0.
 +prometheus-client = ">=0.4.0"
 +# we use `order`, which arrived in attrs 19.2.0.
 +# Note: 21.1.0 broke `/sync`, see #9936
 +attrs = ">=19.2.0,!=21.1.0"
 +netaddr = ">=0.7.18"
 +# Jinja 2.x is incompatible with MarkupSafe>=2.1. To ensure that admins do not
 +# end up with a broken installation, with recent MarkupSafe but old Jinja, we
 +# add a lower bound to the Jinja2 dependency.
 +Jinja2 = ">=3.0"
 +bleach = ">=1.4.3"
 +# We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0.
 +typing-extensions = ">=3.10.0"
 +# We enforce that we have a `cryptography` version that bundles an `openssl`
 +# with the latest security patches.
 +cryptography = ">=3.4.7"
 +# ijson 3.1.4 fixes a bug with "." in property names
 +ijson = ">=3.1.4"
 +matrix-common = "~=1.1.0"
 +# We need packaging.requirements.Requirement, added in 16.1.
 +packaging = ">=16.1"
 +# At the time of writing, we only use functions from the version `importlib.metadata`
 +# which shipped in Python 3.8. This corresponds to version 1.4 of the backport.
 +importlib_metadata = { version = ">=1.4", python = "<3.8" }
 +
 +
 +# Optional Dependencies
 +# ---------------------
 +matrix-synapse-ldap3 = { version = ">=0.1", optional = true }
 +psycopg2 = { version = ">=2.8", markers = "platform_python_implementation != 'PyPy'", optional = true }
 +psycopg2cffi = { version = ">=2.8", markers = "platform_python_implementation == 'PyPy'", optional = true }
 +psycopg2cffi-compat = { version = "==1.1", markers = "platform_python_implementation == 'PyPy'", optional = true }
 +pysaml2 = { version = ">=4.5.0", optional = true }
 +authlib = { version = ">=0.14.0", optional = true }
 +# systemd-python is necessary for logging to the systemd journal via
 +# `systemd.journal.JournalHandler`, as is documented in
 +# `contrib/systemd/log_config.yaml`.
 +# Note: systemd-python 231 appears to have been yanked from pypi
 +systemd-python = { version = ">=231", optional = true }
 +lxml = { version = ">=4.2.0", optional = true }
 +sentry-sdk = { version = ">=0.7.2", optional = true }
 +opentracing = { version = ">=2.2.0", optional = true }
 +jaeger-client = { version = ">=4.0.0", optional = true }
 +pyjwt = { version = ">=1.6.4", optional = true }
 +txredisapi = { version = ">=1.4.7", optional = true }
 +hiredis = { version = "*", optional = true }
 +Pympler = { version = "*", optional = true }
 +parameterized = { version = ">=0.7.4", optional = true }
 +
 +[tool.poetry.extras]
 +# NB: Packages that should be part of `pip install matrix-synapse[all]` need to be specified
 +# twice: once here, and once in the `all` extra.
 +matrix-synapse-ldap3 = ["matrix-synapse-ldap3"]
 +postgres = ["psycopg2", "psycopg2cffi", "psycopg2cffi-compat"]
 +saml2 = ["pysaml2"]
 +oidc = ["authlib"]
 +# systemd-python is necessary for logging to the systemd journal via
 +# `systemd.journal.JournalHandler`, as is documented in
 +# `contrib/systemd/log_config.yaml`.
 +systemd = ["systemd-python"]
 +url_preview = ["lxml"]
 +sentry = ["sentry-sdk"]
 +opentracing = ["jaeger-client", "opentracing"]
 +jwt = ["pyjwt"]
 +# hiredis is not a *strict* dependency, but it makes things much faster.
 +# (if it is not installed, we fall back to slow code.)
 +redis = ["txredisapi", "hiredis"]
 +# Required to use experimental `caches.track_memory_usage` config option.
 +cache_memory = ["pympler"]
 +test = ["parameterized"]
 +
 +# The duplication here is awful. I hate hate hate hate hate it. However, for now I want
 +# to ensure you can still `pip install matrix-synapse[all]` like today. Two motivations:
 +# 1) for new installations, I want instructions in existing documentation and tutorials
 +#    out there to still work.
 +# 2) I don't want to hard-code a list of extras into CI if I can help it. The ideal
 +#    solution here would be something like https://github.com/python-poetry/poetry/issues/3413
 +# Poetry 1.2's dependency groups might make this easier. But I'm not trying that out
 +# until there's a stable release of 1.2.
 +#
 +# NB: the strings in this list must be *package* names, not extra names.
 +# Some of our extra names _are_ package names, which can lead to great confusion.
 +all = [
 +    # matrix-synapse-ldap3
 +    "matrix-synapse-ldap3",
 +    # postgres
 +    "psycopg2", "psycopg2cffi", "psycopg2cffi-compat",
 +    # saml2
 +    "pysaml2",
 +    # oidc
 +    "authlib",
 +    # url_preview
 +    "lxml",
 +    # sentry
 +    "sentry-sdk",
 +    # opentracing
 +    "jaeger-client", "opentracing",
 +    # jwt
 +    "pyjwt",
 +    #redis
 +    "txredisapi", "hiredis"
 +    # omitted:
 +    #   - cache_memory: this is an experimental option
 +    #   - test: it's useful to have this separate from dev deps in the olddeps job
 +    #   - systemd: this is a system-based requirement
 +]
 +
 +[tool.poetry.dev-dependencies]
 +## We pin black so that our tests don't start failing on new releases.
 +isort = "==5.7.0"
 +black = "==22.3.0"
 +flake8-comprehensions = "*"
 +flake8-bugbear = "==21.3.2"
 +flake8 = "*"
 +
 +# Typechecking
 +mypy = "==0.931"
 +mypy-zope = "==0.3.5"
 +types-bleach = ">=4.1.0"
 +types-jsonschema = ">=3.2.0"
 +types-opentracing = ">=2.4.2"
 +types-Pillow = ">=8.3.4"
 +types-psycopg2 = ">=2.9.9"
 +types-pyOpenSSL = ">=20.0.7"
 +types-PyYAML = ">=5.4.10"
 +types-requests = ">=2.26.0"
 +types-setuptools = ">=57.4.0"
 +
 +# Dependencies which are exclusively required by unit test code. This is
 +# NOT a list of all modules that are necessary to run the unit tests.
 +# Tests assume that all optional dependencies are installed.
 +# parameterized<0.7.4 can create classes with names that would normally be invalid
 +# identifiers. trial really does not like this when running with multiple workers.
 +parameterized = ">=0.7.4"
 +
 +# The following are used by the release script
 +click = "==8.1.0"
 +redbaron = "==0.9.2"
 +GitPython = "==3.1.14"
 +commonmark = "==0.9.1"
 +pygithub = "==1.55"
 +# The following are executed as commands by the release script.
 +twine = "*"
 +# Towncrier min version comes from #3425. Rationale unclear.
 +towncrier = ">=18.6.0rc1"
 
 +[build-system]
 +requires = ["poetry-core>=1.0.0"]
 +build-backend = "poetry.core.masonry.api"
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/README.rst dist-poetry/sdist/matrix-synapse-1.55.2/README.rst
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/README.rst	2022-04-04 18:23:17.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/README.rst	2022-04-04 18:21:37.137492700 +0100
 @@ -293,24 +293,26 @@
     git clone https://github.com/matrix-org/synapse.git
     cd synapse
 
 -Synapse has a number of external dependencies, that are easiest
 -to install using pip and a virtualenv::
 +Synapse has a number of external dependencies. We maintain a fixed development
 +environment using [poetry](https://python-poetry.org/). First, install poetry. We recommend
 
 -    python3 -m venv ./env
 -    source ./env/bin/activate
 -    pip install -e ".[all,dev]"
 +    pip install --user pipx
 +    pipx install poetry
 
 -This will run a process of downloading and installing all the needed
 -dependencies into a virtual env. If any dependencies fail to install,
 -try installing the failing modules individually::
 +but see the `poetry installation docs <https://python-poetry.org/docs/#installation>`_
 +for more details. Then ask poetry to create a virtual environment from the project
 +and install Synapse's dependencies::
 +
 +    poetry install --extras "all test"
 
 -    pip install -e "module-name"
 +This will run a process of downloading and installing all the needed
 +dependencies into a virtual env.
 
 We recommend using the demo which starts 3 federated instances running on ports `8080` - `8082`
 
 -    ./demo/start.sh
 +    poetry run ./demo/start.sh
 
 -(to stop, you can use `./demo/stop.sh`)
 +(to stop, you can use `poetry run ./demo/stop.sh`)
 
 See the [demo documentation](https://matrix-org.github.io/synapse/develop/development/demo.html)
 for more information.
 @@ -318,14 +320,14 @@
 If you just want to start a single instance of the app and run it directly::
 
     # Create the homeserver.yaml config once
 -    python -m synapse.app.homeserver \
 +    poetry run synapse_homeserver \
       --server-name my.domain.name \
       --config-path homeserver.yaml \
       --generate-config \
       --report-stats=[yes|no]
 
     # Start the app
 -    python -m synapse.app.homeserver --config-path homeserver.yaml
 +    poetry run synapse_homeserver --config-path homeserver.yaml
 
 
 Running the unit tests
 @@ -334,7 +336,7 @@
 After getting up and running, you may wish to run Synapse's unit tests to
 check that everything is installed correctly::
 
 -    trial tests
 +    poetry run trial tests
 
 This should end with a 'PASSED' result (note that exact numbers will
 differ)::
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/scripts-dev/compare-builds.sh dist-poetry/sdist/matrix-synapse-1.55.2/scripts-dev/compare-builds.sh
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/scripts-dev/compare-builds.sh	2022-04-04 18:23:21.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/scripts-dev/compare-builds.sh	2022-04-04 18:21:01.625420300 +0100
 @@ -22,5 +22,4 @@
 
 # To clean up:
 # rm -r dist{setuptools,poetry}
 -# rm wheel.txt sdist.txt
 
 Only in dist-setuptools/sdist/matrix-synapse-1.55.2/scripts-dev: .compare-builds.sh.swp
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/scripts-dev/lint.sh dist-poetry/sdist/matrix-synapse-1.55.2/scripts-dev/lint.sh
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/scripts-dev/lint.sh	2022-04-04 18:23:17.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/scripts-dev/lint.sh	2022-04-04 18:21:37.140492700 +0100
 @@ -80,13 +80,7 @@
   # then lint everything!
   if [[ -z ${files+x} ]]; then
     # Lint all source code files and directories
 -    # Note: this list aims to mirror the one in tox.ini
 -      files=(
 -          "synapse" "docker" "tests"
 -          # annoyingly, black doesn't find these so we have to list them
 -          "scripts-dev"
 -          "contrib" "setup.py" "synmark" "stubs" ".ci"
 -      )
 +      files=( "." )
   fi
 fi
 
 Only in dist-setuptools/sdist/matrix-synapse-1.55.2: setup.cfg
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/setup.py dist-poetry/sdist/matrix-synapse-1.55.2/setup.py
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/setup.py	2022-04-04 18:23:17.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/setup.py	2022-04-04 18:23:13.584273300 +0100
 @@ -1,183 +1,239 @@
 -#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
 +from setuptools import setup
 
 -# Copyright 2014-2017 OpenMarket Ltd
 -# Copyright 2017 Vector Creations Ltd
 -# Copyright 2017-2018 New Vector Ltd
 -#
 -# Licensed under the Apache License, Version 2.0 (the "License");
 -# you may not use this file except in compliance with the License.
 -# You may obtain a copy of the License at
 -#
 -#     http://www.apache.org/licenses/LICENSE-2.0
 -#
 -# Unless required by applicable law or agreed to in writing, software
 -# distributed under the License is distributed on an "AS IS" BASIS,
 -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 -# See the License for the specific language governing permissions and
 -# limitations under the License.
 -import os
 -from typing import Any, Dict
 -
 -from setuptools import Command, find_packages, setup
 -
 -here = os.path.abspath(os.path.dirname(__file__))
 -
 -
 -# Some notes on `setup.py test`:
 -#
 -# Once upon a time we used to try to make `setup.py test` run `tox` to run the
 -# tests. That's a bad idea for three reasons:
 -#
 -# 1: `setup.py test` is supposed to find out whether the tests work in the
 -#    *current* environmentt, not whatever tox sets up.
 -# 2: Empirically, trying to install tox during the test run wasn't working ("No
 -#    module named virtualenv").
 -# 3: The tox documentation advises against it[1].
 -#
 -# Even further back in time, we used to use setuptools_trial [2]. That has its
 -# own set of issues: for instance, it requires installation of Twisted to build
 -# an sdist (because the recommended mode of usage is to add it to
 -# `setup_requires`). That in turn means that in order to successfully run tox
 -# you have to have the python header files installed for whichever version of
 -# python tox uses (which is python3 on recent ubuntus, for example).
 -#
 -# So, for now at least, we stick with what appears to be the convention among
 -# Twisted projects, and don't attempt to do anything when someone runs
 -# `setup.py test`; instead we direct people to run `trial` directly if they
 -# care.
 -#
 -# [1]: http://tox.readthedocs.io/en/2.5.0/example/basic.html#integration-with-setup-py-test-command
 -# [2]: https://pypi.python.org/pypi/setuptools_trial
 -class TestCommand(Command):
 -    def initialize_options(self):
 -        pass
 -
 -    def finalize_options(self):
 -        pass
 -
 -    def run(self):
 -        print(
 -            """Synapse's tests cannot be run via setup.py. To run them, try:
 -     PYTHONPATH="." trial tests
 -"""
 -        )
 -
 -
 -def read_file(path_segments):
 -    """Read a file from the package. Takes a list of strings to join to
 -    make the path"""
 -    file_path = os.path.join(here, *path_segments)
 -    with open(file_path) as f:
 -        return f.read()
 -
 -
 -def exec_file(path_segments):
 -    """Execute a single python file to get the variables defined in it"""
 -    result: Dict[str, Any] = {}
 -    code = read_file(path_segments)
 -    exec(code, result)
 -    return result
 -
 -
 -version = exec_file(("synapse", "__init__.py"))["__version__"]
 -dependencies = exec_file(("synapse", "python_dependencies.py"))
 -long_description = read_file(("README.rst",))
 -
 -REQUIREMENTS = dependencies["REQUIREMENTS"]
 -CONDITIONAL_REQUIREMENTS = dependencies["CONDITIONAL_REQUIREMENTS"]
 -ALL_OPTIONAL_REQUIREMENTS = dependencies["ALL_OPTIONAL_REQUIREMENTS"]
 -
 -# Make `pip install matrix-synapse[all]` install all the optional dependencies.
 -CONDITIONAL_REQUIREMENTS["all"] = list(ALL_OPTIONAL_REQUIREMENTS)
 -
 -# Developer dependencies should not get included in "all".
 -#
 -# We pin black so that our tests don't start failing on new releases.
 -CONDITIONAL_REQUIREMENTS["lint"] = [
 -    "isort==5.7.0",
 -    "black==22.3.0",
 -    "flake8-comprehensions",
 -    "flake8-bugbear==21.3.2",
 -    "flake8",
 -]
 -
 -CONDITIONAL_REQUIREMENTS["mypy"] = [
 -    "mypy==0.931",
 -    "mypy-zope==0.3.5",
 -    "types-bleach>=4.1.0",
 -    "types-jsonschema>=3.2.0",
 -    "types-opentracing>=2.4.2",
 -    "types-Pillow>=8.3.4",
 -    "types-psycopg2>=2.9.9",
 -    "types-pyOpenSSL>=20.0.7",
 -    "types-PyYAML>=5.4.10",
 -    "types-requests>=2.26.0",
 -    "types-setuptools>=57.4.0",
 -]
 -
 -# Dependencies which are exclusively required by unit test code. This is
 -# NOT a list of all modules that are necessary to run the unit tests.
 -# Tests assume that all optional dependencies are installed.
 -#
 -# parameterized_class decorator was introduced in parameterized 0.7.0
 -CONDITIONAL_REQUIREMENTS["test"] = ["parameterized>=0.7.0"]
 -
 -CONDITIONAL_REQUIREMENTS["dev"] = (
 -    CONDITIONAL_REQUIREMENTS["lint"]
 -    + CONDITIONAL_REQUIREMENTS["mypy"]
 -    + CONDITIONAL_REQUIREMENTS["test"]
 -    + [
 -        # The following are used by the release script
 -        "click==8.1.0",
 -        "redbaron==0.9.2",
 -        "GitPython==3.1.14",
 -        "commonmark==0.9.1",
 -        "pygithub==1.55",
 -        # The following are executed as commands by the release script.
 -        "twine",
 -        "towncrier",
 -    ]
 -)
 -
 -setup(
 -    name="matrix-synapse",
 -    version=version,
 -    packages=find_packages(exclude=["tests", "tests.*"]),
 -    description="Reference homeserver for the Matrix decentralised comms protocol",
 -    install_requires=REQUIREMENTS,
 -    extras_require=CONDITIONAL_REQUIREMENTS,
 -    include_package_data=True,
 -    zip_safe=False,
 -    long_description=long_description,
 -    long_description_content_type="text/x-rst",
 -    python_requires="~=3.7",
 -    entry_points={
 -        "console_scripts": [
 -            # Application
 -            "synapse_homeserver = synapse.app.homeserver:main",
 -            "synapse_worker = synapse.app.generic_worker:main",
 -            "synctl = synapse._scripts.synctl:main",
 -            # Scripts
 -            "export_signing_key = synapse._scripts.export_signing_key:main",
 -            "generate_config = synapse._scripts.generate_config:main",
 -            "generate_log_config = synapse._scripts.generate_log_config:main",
 -            "generate_signing_key = synapse._scripts.generate_signing_key:main",
 -            "hash_password = synapse._scripts.hash_password:main",
 -            "register_new_matrix_user = synapse._scripts.register_new_matrix_user:main",
 -            "synapse_port_db = synapse._scripts.synapse_port_db:main",
 -            "synapse_review_recent_signups = synapse._scripts.review_recent_signups:main",
 -            "update_synapse_database = synapse._scripts.update_synapse_database:main",
 -        ]
 -    },
 -    classifiers=[
 -        "Development Status :: 5 - Production/Stable",
 -        "Topic :: Communications :: Chat",
 -        "License :: OSI Approved :: Apache Software License",
 -        "Programming Language :: Python :: 3 :: Only",
 -        "Programming Language :: Python :: 3.7",
 -        "Programming Language :: Python :: 3.8",
 -        "Programming Language :: Python :: 3.9",
 -        "Programming Language :: Python :: 3.10",
 -    ],
 -    cmdclass={"test": TestCommand},
 -)
 +packages = \
 +['synapse',
 + 'synapse._scripts',
 + 'synapse.api',
 + 'synapse.app',
 + 'synapse.appservice',
 + 'synapse.config',
 + 'synapse.crypto',
 + 'synapse.events',
 + 'synapse.federation',
 + 'synapse.federation.sender',
 + 'synapse.federation.transport',
 + 'synapse.federation.transport.server',
 + 'synapse.groups',
 + 'synapse.handlers',
 + 'synapse.handlers.ui_auth',
 + 'synapse.http',
 + 'synapse.http.federation',
 + 'synapse.logging',
 + 'synapse.metrics',
 + 'synapse.module_api',
 + 'synapse.push',
 + 'synapse.replication',
 + 'synapse.replication.http',
 + 'synapse.replication.slave',
 + 'synapse.replication.slave.storage',
 + 'synapse.replication.tcp',
 + 'synapse.replication.tcp.streams',
 + 'synapse.rest',
 + 'synapse.rest.admin',
 + 'synapse.rest.client',
 + 'synapse.rest.consent',
 + 'synapse.rest.key',
 + 'synapse.rest.key.v2',
 + 'synapse.rest.media',
 + 'synapse.rest.media.v1',
 + 'synapse.rest.synapse',
 + 'synapse.rest.synapse.client',
 + 'synapse.rest.synapse.client.oidc',
 + 'synapse.rest.synapse.client.saml2',
 + 'synapse.server_notices',
 + 'synapse.spam_checker_api',
 + 'synapse.state',
 + 'synapse.storage',
 + 'synapse.storage.databases',
 + 'synapse.storage.databases.main',
 + 'synapse.storage.databases.state',
 + 'synapse.storage.engines',
 + 'synapse.storage.schema',
 + 'synapse.storage.schema.main.delta.20',
 + 'synapse.storage.schema.main.delta.25',
 + 'synapse.storage.schema.main.delta.27',
 + 'synapse.storage.schema.main.delta.30',
 + 'synapse.storage.schema.main.delta.31',
 + 'synapse.storage.schema.main.delta.33',
 + 'synapse.storage.schema.main.delta.34',
 + 'synapse.storage.schema.main.delta.37',
 + 'synapse.storage.schema.main.delta.42',
 + 'synapse.storage.schema.main.delta.48',
 + 'synapse.storage.schema.main.delta.50',
 + 'synapse.storage.schema.main.delta.56',
 + 'synapse.storage.schema.main.delta.57',
 + 'synapse.storage.schema.main.delta.58',
 + 'synapse.storage.schema.main.delta.59',
 + 'synapse.storage.schema.main.delta.61',
 + 'synapse.storage.schema.main.delta.68',
 + 'synapse.storage.schema.state.delta.47',
 + 'synapse.storage.util',
 + 'synapse.streams',
 + 'synapse.util',
 + 'synapse.util.caches']
 +
 +package_data = \
 +{'': ['*'],
 + 'synapse': ['res/*',
 +             'res/templates/*',
 +             'static/*',
 +             'static/client/login/*',
 +             'static/client/login/js/*',
 +             'static/client/register/*',
 +             'static/client/register/js/*'],
 + 'synapse.storage.schema': ['common/*',
 +                            'common/delta/25/*',
 +                            'common/delta/35/*',
 +                            'common/delta/58/*',
 +                            'common/full_schemas/54/*',
 +                            'main/delta/12/*',
 +                            'main/delta/13/*',
 +                            'main/delta/14/*',
 +                            'main/delta/15/*',
 +                            'main/delta/16/*',
 +                            'main/delta/17/*',
 +                            'main/delta/18/*',
 +                            'main/delta/19/*',
 +                            'main/delta/21/*',
 +                            'main/delta/22/*',
 +                            'main/delta/24/*',
 +                            'main/delta/26/*',
 +                            'main/delta/28/*',
 +                            'main/delta/29/*',
 +                            'main/delta/32/*',
 +                            'main/delta/35/*',
 +                            'main/delta/36/*',
 +                            'main/delta/38/*',
 +                            'main/delta/39/*',
 +                            'main/delta/40/*',
 +                            'main/delta/41/*',
 +                            'main/delta/43/*',
 +                            'main/delta/44/*',
 +                            'main/delta/45/*',
 +                            'main/delta/46/*',
 +                            'main/delta/47/*',
 +                            'main/delta/49/*',
 +                            'main/delta/51/*',
 +                            'main/delta/52/*',
 +                            'main/delta/53/*',
 +                            'main/delta/54/*',
 +                            'main/delta/55/*',
 +                            'main/delta/60/*',
 +                            'main/delta/62/*',
 +                            'main/delta/63/*',
 +                            'main/delta/64/*',
 +                            'main/delta/65/*',
 +                            'main/delta/67/*',
 +                            'main/full_schemas/16/*',
 +                            'main/full_schemas/54/*',
 +                            'state/delta/23/*',
 +                            'state/delta/30/*',
 +                            'state/delta/32/*',
 +                            'state/delta/35/*',
 +                            'state/delta/56/*',
 +                            'state/delta/61/*',
 +                            'state/full_schemas/54/*']}
 +
 +install_requires = \
 +['Jinja2>=3.0',
 + 'Pillow>=5.4.0',
 + 'PyNaCl>=1.2.1',
 + 'PyYAML>=3.11',
 + 'Twisted>=18.9.0',
 + 'attrs>=19.2.0,!=21.1.0',
 + 'bcrypt>=3.1.0',
 + 'bleach>=1.4.3',
 + 'canonicaljson>=1.4.0',
 + 'cryptography>=3.4.7',
 + 'frozendict>=1,!=2.1.2',
 + 'idna>=2.5',
 + 'ijson>=3.1.4',
 + 'jsonschema>=3.0.0',
 + 'matrix-common>=1.1.0,<1.2.0',
 + 'msgpack>=0.5.2',
 + 'netaddr>=0.7.18',
 + 'packaging>=16.1',
 + 'phonenumbers>=8.2.0',
 + 'prometheus-client>=0.4.0',
 + 'pyOpenSSL>=16.0.0',
 + 'pyasn1-modules>=0.0.7',
 + 'pyasn1>=0.1.9',
 + 'pymacaroons>=0.13.0',
 + 'service-identity>=18.1.0',
 + 'signedjson>=1.1.0',
 + 'sortedcontainers>=1.4.4',
 + 'treq>=15.1',
 + 'typing-extensions>=3.10.0',
 + 'unpaddedbase64>=2.1.0']
 +
 +extras_require = \
 +{':python_version < "3.8"': ['importlib_metadata>=1.4'],
 + 'all': ['matrix-synapse-ldap3>=0.1',
 +         'pysaml2>=4.5.0',
 +         'authlib>=0.14.0',
 +         'lxml>=4.2.0',
 +         'sentry-sdk>=0.7.2',
 +         'opentracing>=2.2.0',
 +         'jaeger-client>=4.0.0',
 +         'pyjwt>=1.6.4',
 +         'txredisapi>=1.4.7',
 +         'hiredis'],
 + 'all:platform_python_implementation != "PyPy"': ['psycopg2>=2.8'],
 + 'all:platform_python_implementation == "PyPy"': ['psycopg2cffi>=2.8',
 +                                                  'psycopg2cffi-compat==1.1'],
 + 'cache_memory': ['Pympler'],
 + 'jwt': ['pyjwt>=1.6.4'],
 + 'matrix-synapse-ldap3': ['matrix-synapse-ldap3>=0.1'],
 + 'oidc': ['authlib>=0.14.0'],
 + 'opentracing': ['opentracing>=2.2.0', 'jaeger-client>=4.0.0'],
 + 'postgres:platform_python_implementation != "PyPy"': ['psycopg2>=2.8'],
 + 'postgres:platform_python_implementation == "PyPy"': ['psycopg2cffi>=2.8',
 +                                                       'psycopg2cffi-compat==1.1'],
 + 'redis': ['txredisapi>=1.4.7', 'hiredis'],
 + 'saml2': ['pysaml2>=4.5.0'],
 + 'sentry': ['sentry-sdk>=0.7.2'],
 + 'systemd': ['systemd-python>=231'],
 + 'test': ['parameterized>=0.7.4'],
 + 'url_preview': ['lxml>=4.2.0']}
 +
 +entry_points = \
 +{'console_scripts': ['export_signing_key = '
 +                     'synapse._scripts.export_signing_key:main',
 +                     'generate_config = synapse._scripts.generate_config:main',
 +                     'generate_log_config = '
 +                     'synapse._scripts.generate_log_config:main',
 +                     'generate_signing_key = '
 +                     'synapse._scripts.generate_signing_key:main',
 +                     'hash_password = synapse._scripts.hash_password:main',
 +                     'register_new_matrix_user = '
 +                     'synapse._scripts.register_new_matrix_user:main',
 +                     'synapse_homeserver = synapse.app.homeserver:main',
 +                     'synapse_port_db = synapse._scripts.synapse_port_db:main',
 +                     'synapse_review_recent_signups = '
 +                     'synapse._scripts.review_recent_signups:main',
 +                     'synapse_worker = synapse.app.generic_worker:main',
 +                     'synctl = synapse._scripts.synctl:main',
 +                     'update_synapse_database = '
 +                     'synapse._scripts.update_synapse_database:main']}
 +
 +setup_kwargs = {
 +    'name': 'matrix-synapse',
 +    'version': '1.55.2',
 +    'description': 'Homeserver for the Matrix decentralised comms protocol',
 +    'long_description': '=========================================================================\nSynapse |support| |development| |documentation| |license| |pypi| |python|\n=========================================================================\n\n.. contents::\n\nIntroduction\n============\n\nMatrix is an ambitious new ecosystem for open federated Instant Messaging and\nVoIP.  The basics you need to know to get up and running are:\n\n- Everything in Matrix happens in a room.  Rooms are distributed and do not\n  exist on any single server.  Rooms can be located using convenience aliases\n  like ``#matrix:matrix.org`` or ``#test:localhost:8448``.\n\n- Matrix user IDs look like ``@matthew:matrix.org`` (although in the future\n  you will normally refer to yourself and others using a third party identifier\n  (3PID): email address, phone number, etc rather than manipulating Matrix user IDs)\n\nThe overall architecture is::\n\n      client <----> homeserver <=====================> homeserver <----> client\n             https://somewhere.org/_matrix      https://elsewhere.net/_matrix\n\n``#matrix:matrix.org`` is the official support room for Matrix, and can be\naccessed by any client from https://matrix.org/docs/projects/try-matrix-now.html or\nvia IRC bridge at irc://irc.libera.chat/matrix.\n\nSynapse is currently in rapid development, but as of version 0.5 we believe it\nis sufficiently stable to be run as an internet-facing service for real usage!\n\nAbout Matrix\n============\n\nMatrix specifies a set of pragmatic RESTful HTTP JSON APIs as an open standard,\nwhich handle:\n\n- Creating and managing fully distributed chat rooms with no\n  single points of control or failure\n- Eventually-consistent cryptographically secure synchronisation of room\n  state across a global open network of federated servers and services\n- Sending and receiving extensible messages in a room with (optional)\n  end-to-end encryption\n- Inviting, joining, leaving, kicking, banning room members\n- Managing user accounts (registration, login, logout)\n- Using 3rd Party IDs (3PIDs) such as email addresses, phone numbers,\n  Facebook accounts to authenticate, identify and discover users on Matrix.\n- Placing 1:1 VoIP and Video calls\n\nThese APIs are intended to be implemented on a wide range of servers, services\nand clients, letting developers build messaging and VoIP functionality on top\nof the entirely open Matrix ecosystem rather than using closed or proprietary\nsolutions. The hope is for Matrix to act as the building blocks for a new\ngeneration of fully open and interoperable messaging and VoIP apps for the\ninternet.\n\nSynapse is a Matrix "homeserver" implementation developed by the matrix.org core \nteam, written in Python 3/Twisted.\n\nIn Matrix, every user runs one or more Matrix clients, which connect through to\na Matrix homeserver. The homeserver stores all their personal chat history and\nuser account information - much as a mail client connects through to an\nIMAP/SMTP server. Just like email, you can either run your own Matrix\nhomeserver and control and own your own communications and history or use one\nhosted by someone else (e.g. matrix.org) - there is no single point of control\nor mandatory service provider in Matrix, unlike WhatsApp, Facebook, Hangouts,\netc.\n\nWe\'d like to invite you to join #matrix:matrix.org (via\nhttps://matrix.org/docs/projects/try-matrix-now.html), run a homeserver, take a look\nat the `Matrix spec <https://matrix.org/docs/spec>`_, and experiment with the\n`APIs <https://matrix.org/docs/api>`_ and `Client SDKs\n<https://matrix.org/docs/projects/try-matrix-now.html#client-sdks>`_.\n\nThanks for using Matrix!\n\nSupport\n=======\n\nFor support installing or managing Synapse, please join |room|_ (from a matrix.org\naccount if necessary) and ask questions there. We do not use GitHub issues for\nsupport requests, only for bug reports and feature requests.\n\nSynapse\'s documentation is `nicely rendered on GitHub Pages <https://matrix-org.github.io/synapse>`_,\nwith its source available in |docs|_.\n\n.. |room| replace:: ``#synapse:matrix.org``\n.. _room: https://matrix.to/#/#synapse:matrix.org\n\n.. |docs| replace:: ``docs``\n.. _docs: docs\n\nSynapse Installation\n====================\n\n.. _federation:\n\n* For details on how to install synapse, see\n  `Installation Instructions <https://matrix-org.github.io/synapse/latest/setup/installation.html>`_.\n* For specific details on how to configure Synapse for federation see `docs/federate.md <docs/federate.md>`_\n\n\nConnecting to Synapse from a client\n===================================\n\nThe easiest way to try out your new Synapse installation is by connecting to it\nfrom a web client.\n\nUnless you are running a test instance of Synapse on your local machine, in\ngeneral, you will need to enable TLS support before you can successfully\nconnect from a client: see\n`TLS certificates <https://matrix-org.github.io/synapse/latest/setup/installation.html#tls-certificates>`_.\n\nAn easy way to get started is to login or register via Element at\nhttps://app.element.io/#/login or https://app.element.io/#/register respectively.\nYou will need to change the server you are logging into from ``matrix.org``\nand instead specify a Homeserver URL of ``https://<server_name>:8448``\n(or just ``https://<server_name>`` if you are using a reverse proxy).\nIf you prefer to use another client, refer to our\n`client breakdown <https://matrix.org/docs/projects/clients-matrix>`_.\n\nIf all goes well you should at least be able to log in, create a room, and\nstart sending messages.\n\n.. _`client-user-reg`:\n\nRegistering a new user from a client\n------------------------------------\n\nBy default, registration of new users via Matrix clients is disabled. To enable\nit, specify ``enable_registration: true`` in ``homeserver.yaml``. (It is then\nrecommended to also set up CAPTCHA - see `<docs/CAPTCHA_SETUP.md>`_.)\n\nOnce ``enable_registration`` is set to ``true``, it is possible to register a\nuser via a Matrix client.\n\nYour new user name will be formed partly from the ``server_name``, and partly\nfrom a localpart you specify when you create the account. Your name will take\nthe form of::\n\n    @localpart:my.domain.name\n\n(pronounced "at localpart on my dot domain dot name").\n\nAs when logging in, you will need to specify a "Custom server".  Specify your\ndesired ``localpart`` in the \'User name\' box.\n\nSecurity note\n=============\n\nMatrix serves raw, user-supplied data in some APIs -- specifically the `content\nrepository endpoints`_.\n\n.. _content repository endpoints: https://matrix.org/docs/spec/client_server/latest.html#get-matrix-media-r0-download-servername-mediaid\n\nWhilst we make a reasonable effort to mitigate against XSS attacks (for\ninstance, by using `CSP`_), a Matrix homeserver should not be hosted on a\ndomain hosting other web applications. This especially applies to sharing\nthe domain with Matrix web clients and other sensitive applications like\nwebmail. See\nhttps://developer.github.com/changes/2014-04-25-user-content-security for more\ninformation.\n\n.. _CSP: https://github.com/matrix-org/synapse/pull/1021\n\nIdeally, the homeserver should not simply be on a different subdomain, but on\na completely different `registered domain`_ (also known as top-level site or\neTLD+1). This is because `some attacks`_ are still possible as long as the two\napplications share the same registered domain.\n\n.. _registered domain: https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-03#section-2.3\n\n.. _some attacks: https://en.wikipedia.org/wiki/Session_fixation#Attacks_using_cross-subdomain_cookie\n\nTo illustrate this with an example, if your Element Web or other sensitive web\napplication is hosted on ``A.example1.com``, you should ideally host Synapse on\n``example2.com``. Some amount of protection is offered by hosting on\n``B.example1.com`` instead, so this is also acceptable in some scenarios.\nHowever, you should *not* host your Synapse on ``A.example1.com``.\n\nNote that all of the above refers exclusively to the domain used in Synapse\'s\n``public_baseurl`` setting. In particular, it has no bearing on the domain\nmentioned in MXIDs hosted on that server.\n\nFollowing this advice ensures that even if an XSS is found in Synapse, the\nimpact to other applications will be minimal.\n\n\nUpgrading an existing Synapse\n=============================\n\nThe instructions for upgrading synapse are in `the upgrade notes`_.\nPlease check these instructions as upgrading may require extra steps for some\nversions of synapse.\n\n.. _the upgrade notes: https://matrix-org.github.io/synapse/develop/upgrade.html\n\n.. _reverse-proxy:\n\nUsing a reverse proxy with Synapse\n==================================\n\nIt is recommended to put a reverse proxy such as\n`nginx <https://nginx.org/en/docs/http/ngx_http_proxy_module.html>`_,\n`Apache <https://httpd.apache.org/docs/current/mod/mod_proxy_http.html>`_,\n`Caddy <https://caddyserver.com/docs/quick-starts/reverse-proxy>`_,\n`HAProxy <https://www.haproxy.org/>`_ or\n`relayd <https://man.openbsd.org/relayd.8>`_ in front of Synapse. One advantage of\ndoing so is that it means that you can expose the default https port (443) to\nMatrix clients without needing to run Synapse with root privileges.\n\nFor information on configuring one, see `<docs/reverse_proxy.md>`_.\n\nIdentity Servers\n================\n\nIdentity servers have the job of mapping email addresses and other 3rd Party\nIDs (3PIDs) to Matrix user IDs, as well as verifying the ownership of 3PIDs\nbefore creating that mapping.\n\n**They are not where accounts or credentials are stored - these live on home\nservers. Identity Servers are just for mapping 3rd party IDs to matrix IDs.**\n\nThis process is very security-sensitive, as there is obvious risk of spam if it\nis too easy to sign up for Matrix accounts or harvest 3PID data. In the longer\nterm, we hope to create a decentralised system to manage it (`matrix-doc #712\n<https://github.com/matrix-org/matrix-doc/issues/712>`_), but in the meantime,\nthe role of managing trusted identity in the Matrix ecosystem is farmed out to\na cluster of known trusted ecosystem partners, who run \'Matrix Identity\nServers\' such as `Sydent <https://github.com/matrix-org/sydent>`_, whose role\nis purely to authenticate and track 3PID logins and publish end-user public\nkeys.\n\nYou can host your own copy of Sydent, but this will prevent you reaching other\nusers in the Matrix ecosystem via their email address, and prevent them finding\nyou. We therefore recommend that you use one of the centralised identity servers\nat ``https://matrix.org`` or ``https://vector.im`` for now.\n\nTo reiterate: the Identity server will only be used if you choose to associate\nan email address with your account, or send an invite to another user via their\nemail address.\n\n\nPassword reset\n==============\n\nUsers can reset their password through their client. Alternatively, a server admin\ncan reset a users password using the `admin API <docs/admin_api/user_admin_api.md#reset-password>`_\nor by directly editing the database as shown below.\n\nFirst calculate the hash of the new password::\n\n    $ ~/synapse/env/bin/hash_password\n    Password:\n    Confirm password:\n    $2a$12$xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n\nThen update the ``users`` table in the database::\n\n    UPDATE users SET password_hash=\'$2a$12$xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\'\n        WHERE name=\'@test:test.com\';\n\n\nSynapse Development\n===================\n\nThe best place to get started is our\n`guide for contributors <https://matrix-org.github.io/synapse/latest/development/contributing_guide.html>`_.\nThis is part of our larger `documentation <https://matrix-org.github.io/synapse/latest>`_, which includes\ninformation for synapse developers as well as synapse administrators.\n\nDevelopers might be particularly interested in:\n\n* `Synapse\'s database schema <https://matrix-org.github.io/synapse/latest/development/database_schema.html>`_,\n* `notes on Synapse\'s implementation details <https://matrix-org.github.io/synapse/latest/development/internal_documentation/index.html>`_, and\n* `how we use git <https://matrix-org.github.io/synapse/latest/development/git.html>`_.\n\nAlongside all that, join our developer community on Matrix:\n`#synapse-dev:matrix.org <https://matrix.to/#/#synapse-dev:matrix.org>`_, featuring real humans!\n\n\nQuick start\n-----------\n\nBefore setting up a development environment for synapse, make sure you have the\nsystem dependencies (such as the python header files) installed - see\n`Platform-specific prerequisites <https://matrix-org.github.io/synapse/latest/setup/installation.html#platform-specific-prerequisites>`_.\n\nTo check out a synapse for development, clone the git repo into a working\ndirectory of your choice::\n\n    git clone https://github.com/matrix-org/synapse.git\n    cd synapse\n\nSynapse has a number of external dependencies. We maintain a fixed development\nenvironment using [poetry](https://python-poetry.org/). First, install poetry. We recommend\n\n    pip install --user pipx\n    pipx install poetry\n\nbut see the `poetry installation docs <https://python-poetry.org/docs/#installation>`_\nfor more details. Then ask poetry to create a virtual environment from the project\nand install Synapse\'s dependencies::\n\n    poetry install --extras "all test"\n\nThis will run a process of downloading and installing all the needed\ndependencies into a virtual env.\n\nWe recommend using the demo which starts 3 federated instances running on ports `8080` - `8082`\n\n    poetry run ./demo/start.sh\n\n(to stop, you can use `poetry run ./demo/stop.sh`)\n\nSee the [demo documentation](https://matrix-org.github.io/synapse/develop/development/demo.html)\nfor more information.\n\nIf you just want to start a single instance of the app and run it directly::\n\n    # Create the homeserver.yaml config once\n    poetry run synapse_homeserver \\\n      --server-name my.domain.name \\\n      --config-path homeserver.yaml \\\n      --generate-config \\\n      --report-stats=[yes|no]\n\n    # Start the app\n    poetry run synapse_homeserver --config-path homeserver.yaml\n\n\nRunning the unit tests\n----------------------\n\nAfter getting up and running, you may wish to run Synapse\'s unit tests to\ncheck that everything is installed correctly::\n\n    poetry run trial tests\n\nThis should end with a \'PASSED\' result (note that exact numbers will\ndiffer)::\n\n    Ran 1337 tests in 716.064s\n\n    PASSED (skips=15, successes=1322)\n\nFor more tips on running the unit tests, like running a specific test or\nto see the logging output, see the `CONTRIBUTING doc <CONTRIBUTING.md#run-the-unit-tests>`_.\n\n\nRunning the Integration Tests\n-----------------------------\n\nSynapse is accompanied by `SyTest <https://github.com/matrix-org/sytest>`_,\na Matrix homeserver integration testing suite, which uses HTTP requests to\naccess the API as a Matrix client would. It is able to run Synapse directly from\nthe source tree, so installation of the server is not required.\n\nTesting with SyTest is recommended for verifying that changes related to the\nClient-Server API are functioning correctly. See the `SyTest installation\ninstructions <https://github.com/matrix-org/sytest#installing>`_ for details.\n\n\nPlatform dependencies\n=====================\n\nSynapse uses a number of platform dependencies such as Python and PostgreSQL,\nand aims to follow supported upstream versions. See the\n`<docs/deprecation_policy.md>`_ document for more details.\n\n\nTroubleshooting\n===============\n\nNeed help? Join our community support room on Matrix:\n`#synapse:matrix.org <https://matrix.to/#/#synapse:matrix.org>`_\n\nRunning out of File Handles\n---------------------------\n\nIf synapse runs out of file handles, it typically fails badly - live-locking\nat 100% CPU, and/or failing to accept new TCP connections (blocking the\nconnecting client).  Matrix currently can legitimately use a lot of file handles,\nthanks to busy rooms like #matrix:matrix.org containing hundreds of participating\nservers.  The first time a server talks in a room it will try to connect\nsimultaneously to all participating servers, which could exhaust the available\nfile descriptors between DNS queries & HTTPS sockets, especially if DNS is slow\nto respond. (We need to improve the routing algorithm used to be better than\nfull mesh, but as of March 2019 this hasn\'t happened yet).\n\nIf you hit this failure mode, we recommend increasing the maximum number of\nopen file handles to be at least 4096 (assuming a default of 1024 or 256).\nThis is typically done by editing ``/etc/security/limits.conf``\n\nSeparately, Synapse may leak file handles if inbound HTTP requests get stuck\nduring processing - e.g. blocked behind a lock or talking to a remote server etc.\nThis is best diagnosed by matching up the \'Received request\' and \'Processed request\'\nlog lines and looking for any \'Processed request\' lines which take more than\na few seconds to execute. Please let us know at #synapse:matrix.org if\nyou see this failure mode so we can help debug it, however.\n\nHelp!! Synapse is slow and eats all my RAM/CPU!\n-----------------------------------------------\n\nFirst, ensure you are running the latest version of Synapse, using Python 3\nwith a PostgreSQL database.\n\nSynapse\'s architecture is quite RAM hungry currently - we deliberately\ncache a lot of recent room data and metadata in RAM in order to speed up\ncommon requests. We\'ll improve this in the future, but for now the easiest\nway to either reduce the RAM usage (at the risk of slowing things down)\nis to set the almost-undocumented ``SYNAPSE_CACHE_FACTOR`` environment\nvariable. The default is 0.5, which can be decreased to reduce RAM usage\nin memory constrained enviroments, or increased if performance starts to\ndegrade.\n\nHowever, degraded performance due to a low cache factor, common on\nmachines with slow disks, often leads to explosions in memory use due\nbacklogged requests. In this case, reducing the cache factor will make\nthings worse. Instead, try increasing it drastically. 2.0 is a good\nstarting value.\n\nUsing `libjemalloc <http://jemalloc.net/>`_ can also yield a significant\nimprovement in overall memory use, and especially in terms of giving back\nRAM to the OS. To use it, the library must simply be put in the\nLD_PRELOAD environment variable when launching Synapse. On Debian, this\ncan be done by installing the ``libjemalloc1`` package and adding this\nline to ``/etc/default/matrix-synapse``::\n\n    LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1\n\nThis can make a significant difference on Python 2.7 - it\'s unclear how\nmuch of an improvement it provides on Python 3.x.\n\nIf you\'re encountering high CPU use by the Synapse process itself, you\nmay be affected by a bug with presence tracking that leads to a\nmassive excess of outgoing federation requests (see `discussion\n<https://github.com/matrix-org/synapse/issues/3971>`_). If metrics\nindicate that your server is also issuing far more outgoing federation\nrequests than can be accounted for by your users\' activity, this is a\nlikely cause. The misbehavior can be worked around by setting\nthe following in the Synapse config file:\n\n.. code-block:: yaml\n\n   presence:\n       enabled: false\n\nPeople can\'t accept room invitations from me\n--------------------------------------------\n\nThe typical failure mode here is that you send an invitation to someone\nto join a room or direct chat, but when they go to accept it, they get an\nerror (typically along the lines of "Invalid signature"). They might see\nsomething like the following in their logs::\n\n    2019-09-11 19:32:04,271 - synapse.federation.transport.server - 288 - WARNING - GET-11752 - authenticate_request failed: 401: Invalid signature for server <server> with key ed25519:a_EqML: Unable to verify signature for <server>\n\nThis is normally caused by a misconfiguration in your reverse-proxy. See\n`<docs/reverse_proxy.md>`_ and double-check that your settings are correct.\n\n.. |support| image:: https://img.shields.io/matrix/synapse:matrix.org?label=support&logo=matrix\n  :alt: (get support on #synapse:matrix.org)\n  :target: https://matrix.to/#/#synapse:matrix.org\n\n.. |development| image:: https://img.shields.io/matrix/synapse-dev:matrix.org?label=development&logo=matrix\n  :alt: (discuss development on #synapse-dev:matrix.org)\n  :target: https://matrix.to/#/#synapse-dev:matrix.org\n\n.. |documentation| image:: https://img.shields.io/badge/documentation-%E2%9C%93-success\n  :alt: (Rendered documentation on GitHub Pages)\n  :target: https://matrix-org.github.io/synapse/latest/\n\n.. |license| image:: https://img.shields.io/github/license/matrix-org/synapse\n  :alt: (check license in LICENSE file)\n  :target: LICENSE\n\n.. |pypi| image:: https://img.shields.io/pypi/v/matrix-synapse\n  :alt: (latest version released on PyPi)\n  :target: https://pypi.org/project/matrix-synapse\n\n.. |python| image:: https://img.shields.io/pypi/pyversions/matrix-synapse\n  :alt: (supported python versions)\n  :target: https://pypi.org/project/matrix-synapse\n',
 +    'author': 'Matrix.org Team and Contributors',
 +    'author_email': '[email protected]',
 +    'maintainer': None,
 +    'maintainer_email': None,
 +    'url': 'https://github.com/matrix-org/synapse',
 +    'packages': packages,
 +    'package_data': package_data,
 +    'install_requires': install_requires,
 +    'extras_require': extras_require,
 +    'entry_points': entry_points,
 +    'python_requires': '>=3.7,<4.0',
 +}
 +
 +
 +setup(**setup_kwargs)
 diff -ru dist-setuptools/sdist/matrix-synapse-1.55.2/synapse/__init__.py dist-poetry/sdist/matrix-synapse-1.55.2/synapse/__init__.py
 --- dist-setuptools/sdist/matrix-synapse-1.55.2/synapse/__init__.py	2022-04-04 18:23:17.000000000 +0100
 +++ dist-poetry/sdist/matrix-synapse-1.55.2/synapse/__init__.py	2022-04-04 18:21:37.140492700 +0100
 @@ -20,6 +20,8 @@
 import os
 import sys
 
 +from matrix_common.versionstring import get_distribution_version_string
 +
 # Check that we're not running on an unsupported Python version.
 if sys.version_info < (3, 7):
     print("Synapse requires Python 3.7 or above.")
 @@ -68,7 +70,7 @@
 except ImportError:
     pass
 
 -__version__ = "1.55.2"
 +__version__ = get_distribution_version_string("matrix-synapse")
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when
 Only in dist-setuptools/sdist/matrix-synapse-1.55.2/synapse: python_dependencies.py
 Only in dist-poetry/sdist/matrix-synapse-1.55.2: sytest-blacklist
diff --git a/wheel.diff b/wheel.diff
 Only in dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info: AUTHORS.rst
 diff -ru dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info/entry_points.txt dist-poetry/wheel/matrix_synapse-1.55.2.dist-info/entry_points.txt
 --- dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info/entry_points.txt	2022-04-04 17:23:30.000000000 +0100
 +++ dist-poetry/wheel/matrix_synapse-1.55.2.dist-info/entry_points.txt	2016-01-01 00:00:00.000000000 +0000
 @@ -1,13 +1,14 @@
 [console_scripts]
 -export_signing_key = synapse._scripts.export_signing_key:main
 -generate_config = synapse._scripts.generate_config:main
 -generate_log_config = synapse._scripts.generate_log_config:main
 -generate_signing_key = synapse._scripts.generate_signing_key:main
 -hash_password = synapse._scripts.hash_password:main
 -register_new_matrix_user = synapse._scripts.register_new_matrix_user:main
 -synapse_homeserver = synapse.app.homeserver:main
 -synapse_port_db = synapse._scripts.synapse_port_db:main
 -synapse_review_recent_signups = synapse._scripts.review_recent_signups:main
 -synapse_worker = synapse.app.generic_worker:main
 -synctl = synapse._scripts.synctl:main
 -update_synapse_database = synapse._scripts.update_synapse_database:main
 +export_signing_key=synapse._scripts.export_signing_key:main
 +generate_config=synapse._scripts.generate_config:main
 +generate_log_config=synapse._scripts.generate_log_config:main
 +generate_signing_key=synapse._scripts.generate_signing_key:main
 +hash_password=synapse._scripts.hash_password:main
 +register_new_matrix_user=synapse._scripts.register_new_matrix_user:main
 +synapse_homeserver=synapse.app.homeserver:main
 +synapse_port_db=synapse._scripts.synapse_port_db:main
 +synapse_review_recent_signups=synapse._scripts.review_recent_signups:main
 +synapse_worker=synapse.app.generic_worker:main
 +synctl=synapse._scripts.synctl:main
 +update_synapse_database=synapse._scripts.update_synapse_database:main
 +
 diff -ru dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info/METADATA dist-poetry/wheel/matrix_synapse-1.55.2.dist-info/METADATA
 --- dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info/METADATA	2022-04-04 17:23:32.000000000 +0100
 +++ dist-poetry/wheel/matrix_synapse-1.55.2.dist-info/METADATA	2016-01-01 00:00:00.000000000 +0000
 @@ -1,137 +1,82 @@
 Metadata-Version: 2.1
 Name: matrix-synapse
 Version: 1.55.2
 -Summary: Reference homeserver for the Matrix decentralised comms protocol
 -License: UNKNOWN
 -Platform: UNKNOWN
 +Summary: Homeserver for the Matrix decentralised comms protocol
 +Home-page: https://github.com/matrix-org/synapse
 +License: Apache-2.0
 +Author: Matrix.org Team and Contributors
 +Author-email: [email protected]
 +Requires-Python: >=3.7,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 -Classifier: Topic :: Communications :: Chat
 Classifier: License :: OSI Approved :: Apache Software License
 -Classifier: Programming Language :: Python :: 3 :: Only
 +Classifier: Programming Language :: Python :: 3
 +Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 -Classifier: Programming Language :: Python :: 3.10
 -Requires-Python: ~=3.7
 -Description-Content-Type: text/x-rst
 -License-File: LICENSE
 -License-File: AUTHORS.rst
 -Requires-Dist: jsonschema (>=3.0.0)
 -Requires-Dist: frozendict (!=2.1.2,>=1)
 -Requires-Dist: unpaddedbase64 (>=1.1.0)
 -Requires-Dist: canonicaljson (>=1.4.0)
 -Requires-Dist: signedjson (>=1.1.0)
 -Requires-Dist: pynacl (>=1.2.1)
 -Requires-Dist: idna (>=2.5)
 -Requires-Dist: service-identity (>=18.1.0)
 -Requires-Dist: Twisted (>=18.9.0)
 -Requires-Dist: treq (>=15.1)
 -Requires-Dist: pyopenssl (>=16.0.0)
 -Requires-Dist: pyyaml (>=3.11)
 -Requires-Dist: pyasn1 (>=0.1.9)
 -Requires-Dist: pyasn1-modules (>=0.0.7)
 -Requires-Dist: bcrypt (>=3.1.0)
 -Requires-Dist: pillow (>=5.4.0)
 -Requires-Dist: sortedcontainers (>=1.4.4)
 -Requires-Dist: pymacaroons (>=0.13.0)
 -Requires-Dist: msgpack (>=0.5.2)
 -Requires-Dist: phonenumbers (>=8.2.0)
 -Requires-Dist: prometheus-client (>=0.4.0)
 -Requires-Dist: attrs (!=21.1.0,>=19.2.0)
 -Requires-Dist: netaddr (>=0.7.18)
 -Requires-Dist: Jinja2 (>=3.0)
 -Requires-Dist: bleach (>=1.4.3)
 -Requires-Dist: typing-extensions (>=3.10.0)
 -Requires-Dist: cryptography (>=3.4.7)
 -Requires-Dist: ijson (>=3.1.4)
 -Requires-Dist: matrix-common (~=1.1.0)
 -Requires-Dist: packaging (>=16.1)
 +Classifier: Topic :: Communications :: Chat
 Provides-Extra: all
 -Requires-Dist: pympler ; extra == 'all'
 -Requires-Dist: pyjwt (>=1.6.4) ; extra == 'all'
 -Requires-Dist: matrix-synapse-ldap3 (>=0.1) ; extra == 'all'
 -Requires-Dist: sentry-sdk (>=0.7.2) ; extra == 'all'
 -Requires-Dist: pysaml2 (>=4.5.0) ; extra == 'all'
 -Requires-Dist: txredisapi (>=1.4.7) ; extra == 'all'
 -Requires-Dist: authlib (>=0.14.0) ; extra == 'all'
 -Requires-Dist: jaeger-client (>=4.0.0) ; extra == 'all'
 -Requires-Dist: opentracing (>=2.2.0) ; extra == 'all'
 -Requires-Dist: hiredis ; extra == 'all'
 -Requires-Dist: lxml (>=4.2.0) ; extra == 'all'
 -Requires-Dist: psycopg2 (>=2.8) ; (platform_python_implementation != "PyPy") and extra == 'all'
 -Requires-Dist: psycopg2cffi-compat (==1.1) ; (platform_python_implementation == "PyPy") and extra == 'all'
 -Requires-Dist: psycopg2cffi (>=2.8) ; (platform_python_implementation == "PyPy") and extra == 'all'
 Provides-Extra: cache_memory
 -Requires-Dist: pympler ; extra == 'cache_memory'
 -Provides-Extra: dev
 -Requires-Dist: isort (==5.7.0) ; extra == 'dev'
 -Requires-Dist: black (==22.3.0) ; extra == 'dev'
 -Requires-Dist: flake8-comprehensions ; extra == 'dev'
 -Requires-Dist: flake8-bugbear (==21.3.2) ; extra == 'dev'
 -Requires-Dist: flake8 ; extra == 'dev'
 -Requires-Dist: mypy (==0.931) ; extra == 'dev'
 -Requires-Dist: mypy-zope (==0.3.5) ; extra == 'dev'
 -Requires-Dist: types-bleach (>=4.1.0) ; extra == 'dev'
 -Requires-Dist: types-jsonschema (>=3.2.0) ; extra == 'dev'
 -Requires-Dist: types-opentracing (>=2.4.2) ; extra == 'dev'
 -Requires-Dist: types-Pillow (>=8.3.4) ; extra == 'dev'
 -Requires-Dist: types-psycopg2 (>=2.9.9) ; extra == 'dev'
 -Requires-Dist: types-pyOpenSSL (>=20.0.7) ; extra == 'dev'
 -Requires-Dist: types-PyYAML (>=5.4.10) ; extra == 'dev'
 -Requires-Dist: types-requests (>=2.26.0) ; extra == 'dev'
 -Requires-Dist: types-setuptools (>=57.4.0) ; extra == 'dev'
 -Requires-Dist: parameterized (>=0.7.0) ; extra == 'dev'
 -Requires-Dist: click (==8.1.0) ; extra == 'dev'
 -Requires-Dist: redbaron (==0.9.2) ; extra == 'dev'
 -Requires-Dist: GitPython (==3.1.14) ; extra == 'dev'
 -Requires-Dist: commonmark (==0.9.1) ; extra == 'dev'
 -Requires-Dist: pygithub (==1.55) ; extra == 'dev'
 -Requires-Dist: twine ; extra == 'dev'
 -Requires-Dist: towncrier ; extra == 'dev'
 Provides-Extra: jwt
 -Requires-Dist: pyjwt (>=1.6.4) ; extra == 'jwt'
 -Provides-Extra: lint
 -Requires-Dist: isort (==5.7.0) ; extra == 'lint'
 -Requires-Dist: black (==22.3.0) ; extra == 'lint'
 -Requires-Dist: flake8-comprehensions ; extra == 'lint'
 -Requires-Dist: flake8-bugbear (==21.3.2) ; extra == 'lint'
 -Requires-Dist: flake8 ; extra == 'lint'
 Provides-Extra: matrix-synapse-ldap3
 -Requires-Dist: matrix-synapse-ldap3 (>=0.1) ; extra == 'matrix-synapse-ldap3'
 -Provides-Extra: mypy
 -Requires-Dist: mypy (==0.931) ; extra == 'mypy'
 -Requires-Dist: mypy-zope (==0.3.5) ; extra == 'mypy'
 -Requires-Dist: types-bleach (>=4.1.0) ; extra == 'mypy'
 -Requires-Dist: types-jsonschema (>=3.2.0) ; extra == 'mypy'
 -Requires-Dist: types-opentracing (>=2.4.2) ; extra == 'mypy'
 -Requires-Dist: types-Pillow (>=8.3.4) ; extra == 'mypy'
 -Requires-Dist: types-psycopg2 (>=2.9.9) ; extra == 'mypy'
 -Requires-Dist: types-pyOpenSSL (>=20.0.7) ; extra == 'mypy'
 -Requires-Dist: types-PyYAML (>=5.4.10) ; extra == 'mypy'
 -Requires-Dist: types-requests (>=2.26.0) ; extra == 'mypy'
 -Requires-Dist: types-setuptools (>=57.4.0) ; extra == 'mypy'
 Provides-Extra: oidc
 -Requires-Dist: authlib (>=0.14.0) ; extra == 'oidc'
 Provides-Extra: opentracing
 -Requires-Dist: jaeger-client (>=4.0.0) ; extra == 'opentracing'
 -Requires-Dist: opentracing (>=2.2.0) ; extra == 'opentracing'
 Provides-Extra: postgres
 -Requires-Dist: psycopg2 (>=2.8) ; (platform_python_implementation != "PyPy") and extra == 'postgres'
 -Requires-Dist: psycopg2cffi (>=2.8) ; (platform_python_implementation == "PyPy") and extra == 'postgres'
 -Requires-Dist: psycopg2cffi-compat (==1.1) ; (platform_python_implementation == "PyPy") and extra == 'postgres'
 Provides-Extra: redis
 -Requires-Dist: txredisapi (>=1.4.7) ; extra == 'redis'
 -Requires-Dist: hiredis ; extra == 'redis'
 Provides-Extra: saml2
 -Requires-Dist: pysaml2 (>=4.5.0) ; extra == 'saml2'
 Provides-Extra: sentry
 -Requires-Dist: sentry-sdk (>=0.7.2) ; extra == 'sentry'
 Provides-Extra: systemd
 -Requires-Dist: systemd-python (>=231) ; extra == 'systemd'
 Provides-Extra: test
 -Requires-Dist: parameterized (>=0.7.0) ; extra == 'test'
 Provides-Extra: url_preview
 -Requires-Dist: lxml (>=4.2.0) ; extra == 'url_preview'
 +Requires-Dist: Jinja2 (>=3.0)
 +Requires-Dist: Pillow (>=5.4.0)
 +Requires-Dist: PyNaCl (>=1.2.1)
 +Requires-Dist: PyYAML (>=3.11)
 +Requires-Dist: Pympler; extra == "cache_memory"
 +Requires-Dist: Twisted (>=18.9.0)
 +Requires-Dist: attrs (>=19.2.0,!=21.1.0)
 +Requires-Dist: authlib (>=0.14.0); extra == "oidc" or extra == "all"
 +Requires-Dist: bcrypt (>=3.1.0)
 +Requires-Dist: bleach (>=1.4.3)
 +Requires-Dist: canonicaljson (>=1.4.0)
 +Requires-Dist: cryptography (>=3.4.7)
 +Requires-Dist: frozendict (>=1,!=2.1.2)
 +Requires-Dist: hiredis; extra == "redis" or extra == "all"
 +Requires-Dist: idna (>=2.5)
 +Requires-Dist: ijson (>=3.1.4)
 +Requires-Dist: importlib_metadata (>=1.4); python_version < "3.8"
 +Requires-Dist: jaeger-client (>=4.0.0); extra == "opentracing" or extra == "all"
 +Requires-Dist: jsonschema (>=3.0.0)
 +Requires-Dist: lxml (>=4.2.0); extra == "url_preview" or extra == "all"
 +Requires-Dist: matrix-common (>=1.1.0,<1.2.0)
 +Requires-Dist: matrix-synapse-ldap3 (>=0.1); extra == "matrix-synapse-ldap3" or extra == "all"
 +Requires-Dist: msgpack (>=0.5.2)
 +Requires-Dist: netaddr (>=0.7.18)
 +Requires-Dist: opentracing (>=2.2.0); extra == "opentracing" or extra == "all"
 +Requires-Dist: packaging (>=16.1)
 +Requires-Dist: parameterized (>=0.7.4); extra == "test"
 +Requires-Dist: phonenumbers (>=8.2.0)
 +Requires-Dist: prometheus-client (>=0.4.0)
 +Requires-Dist: psycopg2 (>=2.8); (platform_python_implementation != "PyPy") and (extra == "postgres" or extra == "all")
 +Requires-Dist: psycopg2cffi (>=2.8); (platform_python_implementation == "PyPy") and (extra == "postgres" or extra == "all")
 +Requires-Dist: psycopg2cffi-compat (==1.1); (platform_python_implementation == "PyPy") and (extra == "postgres" or extra == "all")
 +Requires-Dist: pyOpenSSL (>=16.0.0)
 +Requires-Dist: pyasn1 (>=0.1.9)
 +Requires-Dist: pyasn1-modules (>=0.0.7)
 +Requires-Dist: pyjwt (>=1.6.4); extra == "jwt" or extra == "all"
 +Requires-Dist: pymacaroons (>=0.13.0)
 +Requires-Dist: pysaml2 (>=4.5.0); extra == "saml2" or extra == "all"
 +Requires-Dist: sentry-sdk (>=0.7.2); extra == "sentry" or extra == "all"
 +Requires-Dist: service-identity (>=18.1.0)
 +Requires-Dist: signedjson (>=1.1.0)
 +Requires-Dist: sortedcontainers (>=1.4.4)
 +Requires-Dist: systemd-python (>=231); extra == "systemd"
 +Requires-Dist: treq (>=15.1)
 +Requires-Dist: txredisapi (>=1.4.7); extra == "redis" or extra == "all"
 +Requires-Dist: typing-extensions (>=3.10.0)
 +Requires-Dist: unpaddedbase64 (>=2.1.0)
 +Project-URL: Repository, https://github.com/matrix-org/synapse
 +Description-Content-Type: text/x-rst
 
 =========================================================================
 Synapse |support| |development| |documentation| |license| |pypi| |python|
 @@ -428,24 +373,26 @@
     git clone https://github.com/matrix-org/synapse.git
     cd synapse
 
 -Synapse has a number of external dependencies, that are easiest
 -to install using pip and a virtualenv::
 +Synapse has a number of external dependencies. We maintain a fixed development
 +environment using [poetry](https://python-poetry.org/). First, install poetry. We recommend
 
 -    python3 -m venv ./env
 -    source ./env/bin/activate
 -    pip install -e ".[all,dev]"
 +    pip install --user pipx
 +    pipx install poetry
 
 -This will run a process of downloading and installing all the needed
 -dependencies into a virtual env. If any dependencies fail to install,
 -try installing the failing modules individually::
 +but see the `poetry installation docs <https://python-poetry.org/docs/#installation>`_
 +for more details. Then ask poetry to create a virtual environment from the project
 +and install Synapse's dependencies::
 
 -    pip install -e "module-name"
 +    poetry install --extras "all test"
 +
 +This will run a process of downloading and installing all the needed
 +dependencies into a virtual env.
 
 We recommend using the demo which starts 3 federated instances running on ports `8080` - `8082`
 
 -    ./demo/start.sh
 +    poetry run ./demo/start.sh
 
 -(to stop, you can use `./demo/stop.sh`)
 +(to stop, you can use `poetry run ./demo/stop.sh`)
 
 See the [demo documentation](https://matrix-org.github.io/synapse/develop/development/demo.html)
 for more information.
 @@ -453,14 +400,14 @@
 If you just want to start a single instance of the app and run it directly::
 
     # Create the homeserver.yaml config once
 -    python -m synapse.app.homeserver \
 +    poetry run synapse_homeserver \
       --server-name my.domain.name \
       --config-path homeserver.yaml \
       --generate-config \
       --report-stats=[yes|no]
 
     # Start the app
 -    python -m synapse.app.homeserver --config-path homeserver.yaml
 +    poetry run synapse_homeserver --config-path homeserver.yaml
 
 
 Running the unit tests
 @@ -469,7 +416,7 @@
 After getting up and running, you may wish to run Synapse's unit tests to
 check that everything is installed correctly::
 
 -    trial tests
 +    poetry run trial tests
 
 This should end with a 'PASSED' result (note that exact numbers will
 differ)::
 @@ -617,4 +564,3 @@
   :alt: (supported python versions)
   :target: https://pypi.org/project/matrix-synapse
 
 -
 diff -ru dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info/RECORD dist-poetry/wheel/matrix_synapse-1.55.2.dist-info/RECORD
 --- dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info/RECORD	2022-04-04 17:23:32.000000000 +0100
 +++ dist-poetry/wheel/matrix_synapse-1.55.2.dist-info/RECORD	2016-01-01 00:00:00.000000000 +0000
 @@ -1,11 +1,4 @@
 -synapse/__init__.py,sha256=q-E8BM7tKYFIfqzeEhsnCfOFjBHCvz1MIzsR7YQa0Tg,2463
 -synapse/event_auth.py,sha256=V1L-AgvQICAXlDjdmWhwJlCHjqzeVdm3oU-Y4BDKzyA,33133
 -synapse/notifier.py,sha256=a_REmdRBlQJNRObyUtHZxaFhb09Y1-uYukAMgA-o2-I,26593
 -synapse/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 -synapse/python_dependencies.py,sha256=BREKJj9wZRKG7pzCxEuNj0Zx8KC1rwcUa-XxHJcb7Cs,5743
 -synapse/server.py,sha256=ehRlTBDalzGFnd3EmqqoIxL9bXWM4mqYS20DBdgMx9I,29394
 -synapse/types.py,sha256=b6qwDMhYK5xzvgoYSLPEuf4AW3Fi1tehi5BA_q-ivm4,27483
 -synapse/visibility.py,sha256=_YNoT0LnXWW3AkbidfkRMQPg9yf8eqwNlSrwElSH1Xc,17078
 +synapse/__init__.py,sha256=9MVbTulWfBgdlkbJ9dnr1APymL79wMblcG9UpdRjFQk,2577
 synapse/_scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/_scripts/export_signing_key.py,sha256=GsgQdJBaI02q-geNzmkVZnmGJfMRelCF0-0t9kMStlg,2686
 synapse/_scripts/generate_config.py,sha256=Izh1ePG4wOAxU8QCF_sdf91ku1wfBFtwzWOwGZXdaoc,2328
 @@ -99,6 +92,7 @@
 synapse/crypto/context_factory.py,sha256=fbEVeDl67mZUo19FwAa8O-8SYjA7bN0urw_smVsYgs4,10680
 synapse/crypto/event_signing.py,sha256=dH7pAOs6hSDROoAm6hnn-Tic6LYO2wuecZF2erqXzHY,6147
 synapse/crypto/keyring.py,sha256=bo_hD6b3PtCqRvJ1xBejWREXEPSIijeRKXhZXWL6bNI,32696
 +synapse/event_auth.py,sha256=V1L-AgvQICAXlDjdmWhwJlCHjqzeVdm3oU-Y4BDKzyA,33133
 synapse/events/__init__.py,sha256=UVIZNv4sD3dqZdOAOKh6oNJzEZGYbEPsNEAssLepOLY,21372
 synapse/events/builder.py,sha256=K_e_-_wXXXTVAqNDWDfQDnc2ybTSxNQBkWZ09vCpjFA,9474
 synapse/events/presence_router.py,sha256=IxgdVQNRjPC-D0BI9WlCFQCuj6Gb1b2REBTArbw_lJY,8429
 @@ -113,7 +107,6 @@
 synapse/federation/federation_server.py,sha256=scqq2taH-aojCylIqgOqOdh_WnKMzE-tN8m3AIKR2OA,55426
 synapse/federation/persistence.py,sha256=WPTCBDj-vAQOwBe-ppEUpSDN9ExJ7b6KcGCmSw7qL5c,2337
 synapse/federation/send_queue.py,sha256=N0cYdiAWaBOmyZrHBpuAPMcpM64DL2DMRl0mls6_Z6c,17089
 -synapse/federation/units.py,sha256=8Nqpsukpx3Lsv1mOatkDd8EzsEhSCIYvlH7-3tnXecE,2946
 synapse/federation/sender/__init__.py,sha256=NmLuWxcUPsoHBoqThJ_dHpRS5NecdncvhTwkUVM80cQ,28676
 synapse/federation/sender/per_destination_queue.py,sha256=FNSa-C77e0n-jbb0IxyVx-IuhaWZPLv-ZrKQ00rSkK8,30042
 synapse/federation/sender/transaction_manager.py,sha256=HeUYVAZftgbZTkKXSEhIqLIBoIxSqlERIhVpw2EoYHA,6806
 @@ -124,6 +117,7 @@
 synapse/federation/transport/server/federation.py,sha256=jGZFpPq9GblnFkWOLwf9cO1G6D2emxzQgQH4nQfs9_s,23954
 synapse/federation/transport/server/groups_local.py,sha256=IWMOA7pBTj8S6dCAuCLnARIZCpGG3NXPiBKmhgu6KlY,3688
 synapse/federation/transport/server/groups_server.py,sha256=Jyc5vy22l_iWytoNocbStX5rWZYadqUPifrv9PzS3Qo,23672
 +synapse/federation/units.py,sha256=8Nqpsukpx3Lsv1mOatkDd8EzsEhSCIYvlH7-3tnXecE,2946
 synapse/groups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/groups/attestations.py,sha256=H3-0XCz99Z5MmXMMfL_KdPnVaBhMzlVzG0qXb8mKZU8,8299
 synapse/groups/groups_server.py,sha256=_kGrwwRGR9siWVUKmIZ7md3nnGE_PbWvwclKzoml7QQ,35813
 @@ -173,23 +167,23 @@
 synapse/handlers/stats.py,sha256=3apRvWtt3D0DSSRslVE73bwFKcGgMVPkOxNttVz_dlI,12569
 synapse/handlers/sync.py,sha256=Cyw89ZjB7_Ih9Ro32Tn-59QHP_NIJNHSKI89wjYkz-Q,97840
 synapse/handlers/typing.py,sha256=-pfAVrJCP3vdQQA7bT_EJJ2R7o-jrYBc6R0wDzsDz_w,19287
 -synapse/handlers/user_directory.py,sha256=QvoMWs5yKip3x6WDtly8l-h7NVKluuds4HDq3y50eGA,19646
 synapse/handlers/ui_auth/__init__.py,sha256=oEuFgD6NJVKm3ZaybJRa2AOcUFGcAu2WfQctHExqnEI,1638
 synapse/handlers/ui_auth/checkers.py,sha256=LGkFcYI9l4-ywwgIGv9utS4WABFVOlgsm5Pi2FRNop0,11605
 +synapse/handlers/user_directory.py,sha256=QvoMWs5yKip3x6WDtly8l-h7NVKluuds4HDq3y50eGA,19646
 synapse/http/__init__.py,sha256=rKwpOWYLZ40dEDC1bpmYdGSqtmQ9lTEbPKG9LoqBdWE,3256
 synapse/http/additional_resource.py,sha256=GO-ZkDIJNdXpUBCuz8xTLhQkh_5gSh18nftryE9KsoE,2079
 synapse/http/client.py,sha256=u9m3DgFCRdTzZJPP-NGR0_Ys9w3GyLKoggLTBmcBjek,32781
 synapse/http/connectproxyclient.py,sha256=WgrjERa04-9hmPqATuysj87x_0z_x9A9DM_QVIr1v60,9453
 +synapse/http/federation/__init__.py,sha256=FZoNr7U46Dy0GEJpOuPgJWTSZNipao-dwn2RNcn9oQ8,578
 +synapse/http/federation/matrix_federation_agent.py,sha256=Q41Suo-Gjr5erUXOJ47KedW0c8ul8ETUbLcfksCwZyg,15930
 +synapse/http/federation/srv_resolver.py,sha256=hFmthHC07cwDtBCdt-CUtTFJ3moCGNKtqnLVGxGBlRM,5829
 +synapse/http/federation/well_known_resolver.py,sha256=y6Q4Dgxtf1-SMm4mgsrQTs63vdxaYJOxycdcvfeIpwk,12294
 synapse/http/matrixfederationclient.py,sha256=v8PSdglC2TXX0S88R8lTySh7FIgLMY3LGYqmN7XXSJw,45283
 synapse/http/proxyagent.py,sha256=l6OxN-amdD1DZbUNJbgxHxPGwdo3xgLb1vq45jHqsEA,12484
 synapse/http/request_metrics.py,sha256=2yzC1XPHBsuOGlSg2XPAaIgIZati-D6ZHIpz-OW6Ers,8373
 synapse/http/server.py,sha256=uOKeXI-Jl-8rMh9ehpRB-Ccx4dZbE7itjBYn4dbq5R4,30744
 synapse/http/servlet.py,sha256=idvrBHw2MPlK1qr8-uawzFeKFauJ6YjrwoOqsLaSy7Q,22241
 synapse/http/site.py,sha256=KnN1GgXXj8rq4IJKQ05IB3_Z830QDhhMMums5cDkE7w,23194
 -synapse/http/federation/__init__.py,sha256=FZoNr7U46Dy0GEJpOuPgJWTSZNipao-dwn2RNcn9oQ8,578
 -synapse/http/federation/matrix_federation_agent.py,sha256=Q41Suo-Gjr5erUXOJ47KedW0c8ul8ETUbLcfksCwZyg,15930
 -synapse/http/federation/srv_resolver.py,sha256=hFmthHC07cwDtBCdt-CUtTFJ3moCGNKtqnLVGxGBlRM,5829
 -synapse/http/federation/well_known_resolver.py,sha256=y6Q4Dgxtf1-SMm4mgsrQTs63vdxaYJOxycdcvfeIpwk,12294
 synapse/logging/__init__.py,sha256=V4UF7jO65Fo9IcxQkZPFw6_q-wwmQk3uJ-zCQlEY6HI,1007
 synapse/logging/_remote.py,sha256=98j07tHIvCBwYfZasyDlST7VJG02bBJBkBGOr5iRuaU,8421
 synapse/logging/_terse_json.py,sha256=Dju-XuCQ_E9geZGrFGBn9gJYLv5VfeEfCXeMxV0WwGU,2478
 @@ -207,6 +201,7 @@
 synapse/metrics/jemalloc.py,sha256=4DCxkD5ocQZT6pQWHwp7_FZp-tTpE4Ed7CupYAgPH0o,6856
 synapse/module_api/__init__.py,sha256=DV5NKGpqL1J2gjldZTrzf5sWJQknUh13xO7notcXuZI,49729
 synapse/module_api/errors.py,sha256=vGSiwZ0i5AM73D34e-4e9BlitGctB5wio2VkuUSHL1k,943
 +synapse/notifier.py,sha256=a_REmdRBlQJNRObyUtHZxaFhb09Y1-uYukAMgA-o2-I,26593
 synapse/push/__init__.py,sha256=gVQXYWsyoC9xMxx-I8bt140JtwlpLoUDcBWEWz9yu1Y,4027
 synapse/push/action_generator.py,sha256=bTmUoa9Af1P3E3OlOOWo3_jeXcX7dj9SPTntZA6ZGA0,1757
 synapse/push/baserules.py,sha256=svfUiCJF9gqWOfVQTH6O8GBLeE8w12zBaPU2C74mNlc,13214
 @@ -222,6 +217,7 @@
 synapse/push/pusher.py,sha256=48odT_r8Pu5B_aznQH4MPIr7cN_tbJottJncqPkY2kg,2840
 synapse/push/pusherpool.py,sha256=ycIoMEUxIQD92suWZr7si7dojns8hsDWtisNPH0p-Qs,14424
 synapse/push/rulekinds.py,sha256=xydgztePvQrj8i_nIeDZVWO641j9SHU8AwY4e3EWq4k,774
 +synapse/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/replication/__init__.py,sha256=OLAVbity20E5RaiSpSNINJO1r-KSvfqMPH7wUu_s4BU,578
 synapse/replication/http/__init__.py,sha256=O14ZVH7-zxcV7WPFNSVfvUqzFJVOXjQvGDC4kDr2WIk,1864
 synapse/replication/http/_base.py,sha256=IvPH1Kp6XplrCsHbwiPfpGz8PdaTl83xzAy1peyeCJw,14223
 @@ -313,8 +309,6 @@
 synapse/res/templates/sso_redirect_confirm.html,sha256=FEmXaVePaWqPdW73GA9JHJ-WHr50HiH_Pq35N4V39lE,2125
 synapse/res/templates/terms.html,sha256=P_S26gSmAKgjSX-y1c7i_gzd2gIALVePPOKE_npkGgA,772
 synapse/rest/__init__.py,sha256=3RXGgrYkyF3ZUVAsxtyfjgt7X5XOg3rw4TRHou3g79U,4638
 -synapse/rest/health.py,sha256=6TRfWQTSTT5rmwI1F9CB7EWsUlI6SXljEvOsrvtjnsQ,1101
 -synapse/rest/well_known.py,sha256=igxJ9wODPTJxEZ--cOWGPkJjq4v2lw5_kLy24PVw0oE,3702
 synapse/rest/admin/__init__.py,sha256=MDLKDGTaAz2PhdBY6RaENmrMGAVtvbD5HWoLASGDyl0,12003
 synapse/rest/admin/_base.py,sha256=tTxKWcpt3D4-cQcJgyqGVokobUTFwaOmGef1H7dupEM,2053
 synapse/rest/admin/background_updates.py,sha256=UjVb7MzCRO-GcBW5M1qX6d_3j3NLh-2LtVsGwkeKXSM,5840
 @@ -374,6 +368,7 @@
 synapse/rest/client/voip.py,sha256=YPSuIWNL0jrYWBmMJx-A5fjNd6Szrv4gqMyyCKjh85U,2791
 synapse/rest/consent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/rest/consent/consent_resource.py,sha256=0A47JEXD5H0E_qn44-T6fwBaZFFqH0rfFHqqFQ2PbLg,7733
 +synapse/rest/health.py,sha256=6TRfWQTSTT5rmwI1F9CB7EWsUlI6SXljEvOsrvtjnsQ,1101
 synapse/rest/key/__init__.py,sha256=SWIzwF3un9DyDNF2z5ip2tPD9CzK7ZCLHMSZuaVqKKE,584
 synapse/rest/key/v2/__init__.py,sha256=3pT0f1SOxKjY8C1Vl-Nf9-DN7CXELudNm8J2XisYhMY,1011
 synapse/rest/key/v2/local_key_resource.py,sha256=Z5PYQaBw9MqV6ymh3M3mEFQMrkcARQGr6pwX8bTWpeo,4023
 @@ -396,15 +391,17 @@
 synapse/rest/synapse/__init__.py,sha256=7B9bBpWQ2igHXNVKxB6JYu7Z1AO9xeGVOm5XJTVIKBg,596
 synapse/rest/synapse/client/__init__.py,sha256=oXtKXTA68EzgifVMmM-9DcIJAvGeP-Xj-ByFt18pIfg,2558
 synapse/rest/synapse/client/new_user_consent.py,sha256=7QCzGzOVyxfve6vEmNGFq_xsNvabZEb5j-NLXvABzlg,4386
 +synapse/rest/synapse/client/oidc/__init__.py,sha256=gr1bdpL5285OebXS5yjtthxjVoakb8CD8C0vErag1Nw,1050
 +synapse/rest/synapse/client/oidc/callback_resource.py,sha256=r5pnTgkOvS3EHZeHU3KvJNTE9d3dNfYs1atl1dJc3kA,1488
 synapse/rest/synapse/client/password_reset.py,sha256=Uasx_as7Cs3Po_msVjeqSkLkpPORwQsw6Mcg12jqQSY,4739
 synapse/rest/synapse/client/pick_idp.py,sha256=3fHGAThGpLMDXS8urjMYUat5ap3DjkKWR6LP2dR8E0Y,2958
 synapse/rest/synapse/client/pick_username.py,sha256=_XmhscIbf4znKsLwAGh4Axeq3NjJwcZPdmME90wFCTo,5556
 -synapse/rest/synapse/client/sso_register.py,sha256=RI3n0XJjLccCKOisRxBpd34pQaef36hiPibIppEzbzg,1856
 -synapse/rest/synapse/client/oidc/__init__.py,sha256=gr1bdpL5285OebXS5yjtthxjVoakb8CD8C0vErag1Nw,1050
 -synapse/rest/synapse/client/oidc/callback_resource.py,sha256=r5pnTgkOvS3EHZeHU3KvJNTE9d3dNfYs1atl1dJc3kA,1488
 synapse/rest/synapse/client/saml2/__init__.py,sha256=31QXHonjckSCXkIxEXR3cB3dgLDSEL9lKuL4ph-qxWw,1213
 synapse/rest/synapse/client/saml2/metadata_resource.py,sha256=EtTpvS3iISnojfDDg3lYS2rPk2VXl4yCIOyi6hEybOI,1308
 synapse/rest/synapse/client/saml2/response_resource.py,sha256=kRamMZ_JZJGTAlHCUctzO6Yli0-8drsNoH1XhFKEFzc,1767
 +synapse/rest/synapse/client/sso_register.py,sha256=RI3n0XJjLccCKOisRxBpd34pQaef36hiPibIppEzbzg,1856
 +synapse/rest/well_known.py,sha256=igxJ9wODPTJxEZ--cOWGPkJjq4v2lw5_kLy24PVw0oE,3702
 +synapse/server.py,sha256=ehRlTBDalzGFnd3EmqqoIxL9bXWM4mqYS20DBdgMx9I,29394
 synapse/server_notices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse/server_notices/consent_server_notices.py,sha256=T63dmCy7ca3adK52Pgctd_QP0koTo5i1_7LtUwgCRTQ,4770
 synapse/server_notices/resource_limits_server_notices.py,sha256=bj_Fmadu52Qaj--x68u63wTW919n_KBUl1TBrYwUg5Q,8586
 @@ -415,29 +412,21 @@
 synapse/state/__init__.py,sha256=X1dHi6p3-wRja6m4TnQvpMe21uswtIUkTpS4ZyJT8Cc,29322
 synapse/state/v1.py,sha256=T-PgTiu32JeTDV7aSQTPbdgOqH2AxZ_7TDs5FafMRHQ,12378
 synapse/state/v2.py,sha256=6LMuuhDrahsgQ0uGEfdpsKtDihyuuHqMkQK6HzvXxEY,25389
 -synapse/static/index.html,sha256=VR1axq4ujEKZUWDCVpw94ajruPquuJfm22eAwTR1OTM,10168
 synapse/static/client/login/index.html,sha256=ZuG8PoULfrksJGAYhJxSxQO05EnvWhMbUQFlO77zSgQ,1699
 -synapse/static/client/login/spinner.gif,sha256=l9hNBCvCYi162UlrzsELYtOD_1qmjjOKPAPFKfoIYl8,1849
 -synapse/static/client/login/style.css,sha256=w2IR0MWWvZkKK6ce2veZzbCgHUGcAKbCv4HCpbtCf6k,1224
 synapse/static/client/login/js/jquery-3.4.1.min.js,sha256=CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo,88145
 synapse/static/client/login/js/login.js,sha256=D2CtVoJA12taO1cmO4ZEmtKJfV0yq6dnBF084Lb9bMg,8277
 +synapse/static/client/login/spinner.gif,sha256=l9hNBCvCYi162UlrzsELYtOD_1qmjjOKPAPFKfoIYl8,1849
 +synapse/static/client/login/style.css,sha256=w2IR0MWWvZkKK6ce2veZzbCgHUGcAKbCv4HCpbtCf6k,1224
 synapse/static/client/register/index.html,sha256=7PZrheghX1X70jKCKqAf6Z-ulUN36TLs4HLo8Xu4ock,1279
 -synapse/static/client/register/register_config.sample.js,sha256=_goy6w62z9JZ9oenhW-qWVB4s8nzOfOBXM1zovOqpRo,81
 -synapse/static/client/register/style.css,sha256=ghZBh31m6BN6qYlEZpN_3_iTvI4cK9OHCwLRfTdEduE,1046
 synapse/static/client/register/js/jquery-3.4.1.min.js,sha256=CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo,88145
 synapse/static/client/register/js/register.js,sha256=bwiV0Hl3zSueSt8oDRWDGWECpor3VZDzNuoFIbytvwc,3566
 +synapse/static/client/register/register_config.sample.js,sha256=_goy6w62z9JZ9oenhW-qWVB4s8nzOfOBXM1zovOqpRo,81
 +synapse/static/client/register/style.css,sha256=ghZBh31m6BN6qYlEZpN_3_iTvI4cK9OHCwLRfTdEduE,1046
 +synapse/static/index.html,sha256=VR1axq4ujEKZUWDCVpw94ajruPquuJfm22eAwTR1OTM,10168
 synapse/storage/__init__.py,sha256=HQWO9Oj_Jzg4kekVYEsyC4bUQbsD79BeGKZPH-S_PTA,2321
 synapse/storage/_base.py,sha256=6ZIJXqwl7rEEOvMzYUB-8jgAA0kSv2GmQ7_q-62KkWQ,4627
 synapse/storage/background_updates.py,sha256=PiuLNq3HO5JKMkdKex4A710Ixa2HZXbBGVRfGub2xyk,24686
 synapse/storage/database.py,sha256=BEKBf8-bpcOJU4__UH5H8Gx2HrnhOjRbBQSyyUdYNyc,78745
 -synapse/storage/keys.py,sha256=W_bal8BdF7Y5ZAKgUXBEj7c4NhHOcwM1QkyYr9tkWb0,902
 -synapse/storage/persist_events.py,sha256=4OKATxHYyfw0HagU5jTBFaNoWrHuqpbzqM0EU0s7RcQ,44837
 -synapse/storage/prepare_database.py,sha256=dmYy-euuwpHxNU1IMIeZVqKB_BT96PGLQIlMAxxqyxY,25228
 -synapse/storage/purge_events.py,sha256=RDtfu5RqTUlNqHCyOzY50_k03JTZ3pum4PAmNlwzZA4,3947
 -synapse/storage/push_rule.py,sha256=NMyBtB9pZ1e7JhlfEKGkQsyDdVs2WcGt09r45IN85xg,721
 -synapse/storage/roommember.py,sha256=DlsbAbnuAxlYO5DIAwb_0vz2e0x6Xzw5MQnGdMvIMAc,1666
 -synapse/storage/state.py,sha256=2XEMxePFw_WvT3i3nZRCDljYW0yfgw8Fw0x_gn_u7sg,28785
 -synapse/storage/types.py,sha256=X3RqAYzKmFrMaFOnaJ_mEzAMkBujLZUX68O_Jp-DuvM,2253
 synapse/storage/databases/__init__.py,sha256=OShpMsMBsTnsaEHB5T7vWXZ9XjVvNYX0pp7eVbAuQsY,5230
 synapse/storage/databases/main/__init__.py,sha256=u7wK34XOA6MQDHSsabKBt_uQVbL-kdgiZOx-X68xi5w,12978
 synapse/storage/databases/main/account_data.py,sha256=DbTIUV85QAUZjkuegwWRtBOw4lfj2XL-lBRFKTjBObE,26045
 @@ -495,13 +484,19 @@
 synapse/storage/engines/_base.py,sha256=xE_ebyRWmz-2M6siGMsPzWVo9wdZpmYaJ5xsaw28aqE,3566
 synapse/storage/engines/postgres.py,sha256=2N5cYATYto8aPGFHUHP04GJNYY3VJJw-eqX4_2ExkLA,8383
 synapse/storage/engines/sqlite.py,sha256=95tbh9XkvXMtEEl8n0J6XeUZDVb6BA7h5wWBiocxcQw,5436
 +synapse/storage/keys.py,sha256=W_bal8BdF7Y5ZAKgUXBEj7c4NhHOcwM1QkyYr9tkWb0,902
 +synapse/storage/persist_events.py,sha256=4OKATxHYyfw0HagU5jTBFaNoWrHuqpbzqM0EU0s7RcQ,44837
 +synapse/storage/prepare_database.py,sha256=dmYy-euuwpHxNU1IMIeZVqKB_BT96PGLQIlMAxxqyxY,25228
 +synapse/storage/purge_events.py,sha256=RDtfu5RqTUlNqHCyOzY50_k03JTZ3pum4PAmNlwzZA4,3947
 +synapse/storage/push_rule.py,sha256=NMyBtB9pZ1e7JhlfEKGkQsyDdVs2WcGt09r45IN85xg,721
 +synapse/storage/roommember.py,sha256=DlsbAbnuAxlYO5DIAwb_0vz2e0x6Xzw5MQnGdMvIMAc,1666
 synapse/storage/schema/README.md,sha256=Uqr4ZhQd6veOSCuv5uDA6HUDXDOS0hG9-QdUJvuR9R4,207
 synapse/storage/schema/__init__.py,sha256=MlOSu5NIpGHStwHTXFuhxKjqh0EcV4bYgXwyIFr1kYA,3187
 -synapse/storage/schema/common/schema_version.sql,sha256=8rvTrpCPoIgqxIhLfR7eZPxyoUrk8lF7DEU5C_RNrC8,1515
 synapse/storage/schema/common/delta/25/00background_updates.sql,sha256=3GYrhCNTeHS5YChpAzUiboIAt3PDSH5lMo7GfgT5KZM,867
 synapse/storage/schema/common/delta/35/00background_updates_add_col.sql,sha256=_u5jAED3-SQ6ybwNuXfx2foGQZRt2IbqIURkPEAPDk8,655
 synapse/storage/schema/common/delta/58/00background_update_ordering.sql,sha256=xFZZzoqs0m-wgeKjHPp6GpphkO4ocM7PY1BU7Wq1ENQ,814
 synapse/storage/schema/common/full_schemas/54/full.sql,sha256=EBW6jH33Jkhv3NsEF-3fXKCKTKSMhmTXci67NZagEgc,190
 +synapse/storage/schema/common/schema_version.sql,sha256=8rvTrpCPoIgqxIhLfR7eZPxyoUrk8lF7DEU5C_RNrC8,1515
 synapse/storage/schema/main/delta/12/v12.sql,sha256=TNgio06_TLjr1ZUHHHb0DfRKBIYVhEufvQMt5ryQbYI,1895
 synapse/storage/schema/main/delta/13/v13.sql,sha256=QGrLXQAivBo_MvORAf8NXXNXw3Imod5S43FfU0LwzUk,759
 synapse/storage/schema/main/delta/14/v14.sql,sha256=IRcPhSm4tHbJ16uEmBMtTqDFQUqcRRpbifroVaK0NXI,881
 @@ -813,15 +808,29 @@
 synapse/storage/schema/state/delta/61/02state_groups_state_n_distinct.sql.postgres,sha256=_XQgLqUGtcPnESQHJu7WnG8yV-Uw9kncIc9GclJHwGU,1662
 synapse/storage/schema/state/full_schemas/54/full.sql,sha256=yfA6mhiEmlybv_Y53iQPiFuloXNyrGw3muyXrdRn1bs,1257
 synapse/storage/schema/state/full_schemas/54/sequence.sql.postgres,sha256=7TuQQS7jMp8spnCrNdROKz4v8wO6ie_JSVVhJdqrP7U,728
 +synapse/storage/state.py,sha256=2XEMxePFw_WvT3i3nZRCDljYW0yfgw8Fw0x_gn_u7sg,28785
 +synapse/storage/types.py,sha256=X3RqAYzKmFrMaFOnaJ_mEzAMkBujLZUX68O_Jp-DuvM,2253
 synapse/storage/util/__init__.py,sha256=-KC8fCSul9qsV1jul4F4hMdWcc3HPNv9YFTtlJKX1ps,583
 synapse/storage/util/id_generators.py,sha256=qEbJyeIzTfqFpNtmU5IQeUNE1tjaBmC_m-Qp9FGRlJQ,31602
 synapse/storage/util/sequence.py,sha256=NfWBtjGsEWnQrN6xO2SSlB8co1DMiAsgMEQjJTGPk0Y,9949
 synapse/streams/__init__.py,sha256=0J7oX3d5SeizT3qPh2mw6tIilSeCXu8KjxGHS11tNe8,1092
 synapse/streams/config.py,sha256=4zabib_LNk3mAFKKspaZmW75eelSE_JMJVOaRiHp8no,2895
 synapse/streams/events.py,sha256=_am8dnldQIa4F3WcipkcfS_0G0d9L7BmFHj9ZVMVrtA,3529
 +synapse/types.py,sha256=b6qwDMhYK5xzvgoYSLPEuf4AW3Fi1tehi5BA_q-ivm4,27483
 synapse/util/__init__.py,sha256=3aw34ve8tbKEVABanJ2QcsMMOP3a9Z2pOtuTrA3xfcQ,6571
 synapse/util/async_helpers.py,sha256=bRMtQoxetVQv-rsHSWxjuvH08a7f1VNMEJl3CXXC0xg,26106
 synapse/util/batching_queue.py,sha256=jPbLbRcMjQj2ifaW1-ls_NPE2TqeN-tRmJJiVNtPSqU,6342
 +synapse/util/caches/__init__.py,sha256=kFpGbBuy9xKAx-CfCN1GDXwuRE_sJzN35YyUYJ8slr4,7535
 +synapse/util/caches/cached_call.py,sha256=OmYmirw_8r_eWYamj64IdroaTpcmAysHgpZZHpXZvW8,5373
 +synapse/util/caches/deferred_cache.py,sha256=4lInUwjSnM_wMu8pnooVdT5_cUrRsIW7McwQqV0VL-0,13112
 +synapse/util/caches/descriptors.py,sha256=ob6CrJ1qgt7nFt-W5hhRbibOGho3lBvlMnXfXqBr4XY,25523
 +synapse/util/caches/dictionary_cache.py,sha256=FNpa8zMMSrGfT__c62uig26sqnOQDHVM3qUXwqYOxew,5658
 +synapse/util/caches/expiringcache.py,sha256=pGrzIgx4EdW7w8BoB9WF7rVuhcy4byrf1YDX8XnfaSE,6972
 +synapse/util/caches/lrucache.py,sha256=K_mKuipOPJRcip4M1daDnaKF4uksUYJhvJcBXEIPeI4,22375
 +synapse/util/caches/response_cache.py,sha256=KkyBuoJbe1nNqiWtkhuggPN3orN5ZGJH9l_O11Rlq-E,8855
 +synapse/util/caches/stream_change_cache.py,sha256=quRjNuDT6B2TCZqzlFukVQT8POuBT59_UL593EVPjW0,7817
 +synapse/util/caches/treecache.py,sha256=a4-t8GHvc2xoAIfGa3eosojP0fwMKTteU7Pl8EK83sQ,4545
 +synapse/util/caches/ttlcache.py,sha256=i1hVXfX7FehorXpyn7YX7CmWf4lRPxD_eDqe0ElZgcc,5286
 synapse/util/check_dependencies.py,sha256=WLlbg58SaqIwShq1Srfuf7H_50umpuaNBgH0hy40n1c,7174
 synapse/util/daemonize.py,sha256=_V482rB9VhA5yD9xX0uDQsr4QLl2WEiKi90zaM75uTE,5047
 synapse/util/distributor.py,sha256=U4JDZ4vUAHMyQII8vxoBq9soGT2aFt_N1b-qk_NlG5s,4671
 @@ -847,27 +856,9 @@
 synapse/util/templates.py,sha256=hncitoVtF4D4PE7AO4FkfVTBWt1oLLbVVLMi1-LxwI8,3963
 synapse/util/threepids.py,sha256=-XU6Tfo4ZxLzC_wIwDyFwJhA87doaWNVXmLQjth2kqk,3656
 synapse/util/wheel_timer.py,sha256=9qMWfImDhEWAnTGA7rxeWAfhtrSHZlOlysevlwS7hFE,3021
 -synapse/util/caches/__init__.py,sha256=kFpGbBuy9xKAx-CfCN1GDXwuRE_sJzN35YyUYJ8slr4,7535
 -synapse/util/caches/cached_call.py,sha256=OmYmirw_8r_eWYamj64IdroaTpcmAysHgpZZHpXZvW8,5373
 -synapse/util/caches/deferred_cache.py,sha256=4lInUwjSnM_wMu8pnooVdT5_cUrRsIW7McwQqV0VL-0,13112
 -synapse/util/caches/descriptors.py,sha256=ob6CrJ1qgt7nFt-W5hhRbibOGho3lBvlMnXfXqBr4XY,25523
 -synapse/util/caches/dictionary_cache.py,sha256=FNpa8zMMSrGfT__c62uig26sqnOQDHVM3qUXwqYOxew,5658
 -synapse/util/caches/expiringcache.py,sha256=pGrzIgx4EdW7w8BoB9WF7rVuhcy4byrf1YDX8XnfaSE,6972
 -synapse/util/caches/lrucache.py,sha256=K_mKuipOPJRcip4M1daDnaKF4uksUYJhvJcBXEIPeI4,22375
 -synapse/util/caches/response_cache.py,sha256=KkyBuoJbe1nNqiWtkhuggPN3orN5ZGJH9l_O11Rlq-E,8855
 -synapse/util/caches/stream_change_cache.py,sha256=quRjNuDT6B2TCZqzlFukVQT8POuBT59_UL593EVPjW0,7817
 -synapse/util/caches/treecache.py,sha256=a4-t8GHvc2xoAIfGa3eosojP0fwMKTteU7Pl8EK83sQ,4545
 -synapse/util/caches/ttlcache.py,sha256=i1hVXfX7FehorXpyn7YX7CmWf4lRPxD_eDqe0ElZgcc,5286
 -synmark/__init__.py,sha256=lslmNR8FUQMXbNDnu8xG2xy_4qNW8lnxGELx8LKtUHY,1140
 -synmark/__main__.py,sha256=HZUvMQhU4Sg4j6Lf7_bBdd7DqJo4wam_w2yclgjvfvs,2875
 -synmark/suites/__init__.py,sha256=mBFt_LHA0eEgDrmZmd2xS4mqMEkbXTYDNRGoCQlYd-U,176
 -synmark/suites/logging.py,sha256=MprBOxsv4FTq81ezYWNdTEmgX-sPdx_NwlGK07x-Q8A,3680
 -synmark/suites/lrucache.py,sha256=GVruQjJpCr15iTY3a7YpzCZr4OKi_kf-k5Bn_1dzKDg,963
 -synmark/suites/lrucache_evict.py,sha256=QSrjdMJJRdOxustHFiB5RS5vM-ICFd1ya1RzfvuU2rA,986
 -matrix_synapse-1.55.2.dist-info/AUTHORS.rst,sha256=KvPRmsv8L-ZN9AA51KsR-4fZu0ajfkCbSNNH9rhRUO4,1611
 +synapse/visibility.py,sha256=_YNoT0LnXWW3AkbidfkRMQPg9yf8eqwNlSrwElSH1Xc,17078
 +matrix_synapse-1.55.2.dist-info/entry_points.txt,sha256=Xf4Z-Sp4lk8P9pbRhSD40XrhhkooqYWm1OtxUlPwPgs,709
 matrix_synapse-1.55.2.dist-info/LICENSE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
 -matrix_synapse-1.55.2.dist-info/METADATA,sha256=oAnXQrAgtukz1dnjwDo-VTqB-kHZqN1-QSiO8yk6WBc,26830
 -matrix_synapse-1.55.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
 -matrix_synapse-1.55.2.dist-info/entry_points.txt,sha256=6ZSHAdDPvgySHaYMTHxP9d6l5RG3fgY71-uXCJ9RMVs,732
 -matrix_synapse-1.55.2.dist-info/top_level.txt,sha256=Qthr8rUSXJ5d5fLvGqapun9mJcLvwt20xWUXeEepeTw,16
 +matrix_synapse-1.55.2.dist-info/WHEEL,sha256=DA86_h4QwwzGeRoz62o1svYt5kGEXpoUTuTtwzoTb30,83
 +matrix_synapse-1.55.2.dist-info/METADATA,sha256=K1Iiu49qtkhSHSEHPnDG0MMXVBMWMt-V7UcA5zZz_Sk,24365
 matrix_synapse-1.55.2.dist-info/RECORD,,
 Only in dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info: top_level.txt
 diff -ru dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info/WHEEL dist-poetry/wheel/matrix_synapse-1.55.2.dist-info/WHEEL
 --- dist-setuptools/wheel/matrix_synapse-1.55.2.dist-info/WHEEL	2022-04-04 17:23:32.000000000 +0100
 +++ dist-poetry/wheel/matrix_synapse-1.55.2.dist-info/WHEEL	2016-01-01 00:00:00.000000000 +0000
 @@ -1,5 +1,4 @@
 Wheel-Version: 1.0
 -Generator: bdist_wheel (0.37.1)
 +Generator: poetry 1.0.8
 Root-Is-Purelib: true
 Tag: py3-none-any
 -
 diff -ru dist-setuptools/wheel/synapse/__init__.py dist-poetry/wheel/synapse/__init__.py
 --- dist-setuptools/wheel/synapse/__init__.py	2022-04-04 17:23:16.000000000 +0100
 +++ dist-poetry/wheel/synapse/__init__.py	1980-01-01 00:00:00.000000000 +0000
 @@ -20,6 +20,8 @@
 import os
 import sys
 
 +from matrix_common.versionstring import get_distribution_version_string
 +
 # Check that we're not running on an unsupported Python version.
 if sys.version_info < (3, 7):
     print("Synapse requires Python 3.7 or above.")
 @@ -68,7 +70,7 @@
 except ImportError:
     pass
 
 -__version__ = "1.55.2"
 +__version__ = get_distribution_version_string("matrix-synapse")
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when
 Only in dist-setuptools/wheel/synapse: python_dependencies.py
 Only in dist-setuptools/wheel: synmark
	#! /usr/bin/env bash

	# This script compares the wheels and sdists for Synapse built using poetry and using existing tooling.
	# See https://github.com/matrix-org/synapse/pull/12337 and https://github.com/matrix-org/synapse/issues/11537.

	set -xeuo pipefail

	git switch dmr/pyproject-poetry
	POETRY_BRANCH_VERSION=$(poetry version -s)
	python -m build --outdir dist-poetry
	unzip -d dist-poetry/wheel "dist-poetry/matrix_synapse-$POETRY_BRANCH_VERSION-py3-none-any.whl"
	mkdir -p dist-poetry/sdist
	tar -xzf "dist-poetry/matrix-synapse-$POETRY_BRANCH_VERSION.tar.gz" -C dist-poetry/sdist

	COMMON_ANCESTOR_COMMIT=$(git merge-base develop dmr/pyproject-poetry)
	git checkout "$COMMON_ANCESTOR_COMMIT"
	SYNAPSE_DEVELOP_VERSION=$(python -c 'import synapse; print(synapse.__version__)')

	if [ "$POETRY_BRANCH_VERSION" != "$SYNAPSE_DEVELOP_VERSION" ]; then
	echo "Project versions differ: poetry=$POETRY_BRANCH_VERSION, setuptools=$SYNAPSE_DEVELOP_VERSION" > /dev/stderr
	exit 1
	fi

	python -m build --outdir dist-setuptools
	unzip -d dist-setuptools/wheel "dist-setuptools/matrix_synapse-$SYNAPSE_DEVELOP_VERSION-py3-none-any.whl"
	mkdir -p dist-setuptools/sdist
	tar -xzf "dist-setuptools/matrix-synapse-$SYNAPSE_DEVELOP_VERSION.tar.gz" -C dist-setuptools/sdist

	diff -ru dist-{setuptools,poetry}/wheel > wheel.diff \|\| true
	diff -ru dist-{setuptools,poetry}/sdist > sdist.diff \|\| true

	# To clean up:
	# rm -r dist{setuptools,poetry}
	# rm {wheel,sdist}.diff