diff options
| author | David Robertson <davidr@element.io> | 2022-03-01 17:44:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 17:44:41 +0000 |
| commit | 313581e4e9bc2ec3d59ccff86e3a0c02661f71c4 (patch) | |
| tree | e7cca1740f8fb1011201a3e05a973e6c9f513654 /synapse/app | |
| parent | Fix rare error in `ReadWriteLock` when writers complete immediately (#12105) (diff) | |
| download | synapse-313581e4e9bc2ec3d59ccff86e3a0c02661f71c4.tar.xz | |
Use importlib.metadata to read requirements (#12088)
* Pull runtime dep checks into their own module * Reimplement `check_requirements` using `importlib` I've tried to make this clearer. We start by working out which of Synapse's requirements we need to be installed here and now. I was surprised that there wasn't an easier way to see which packages were installed by a given extra. I've pulled out the error messages into functions that deal with "is this for an extra or not". And I've rearranged the loop over two different sets of requirements into one loop with a "must be instaled" flag. I hope you agree that this is clearer. * Test cases
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/__init__.py | 6 | ||||
| -rw-r--r-- | synapse/app/homeserver.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index ee51480a9e..334c3d2c17 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -15,13 +15,13 @@ import logging import sys from typing import Container -from synapse import python_dependencies # noqa: E402 +from synapse.util import check_dependencies logger = logging.getLogger(__name__) try: - python_dependencies.check_requirements() -except python_dependencies.DependencyException as e: + check_dependencies.check_requirements() +except check_dependencies.DependencyException as e: sys.stderr.writelines( e.message # noqa: B306, DependencyException.message is a property ) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b9931001c2..a6789a840e 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -59,7 +59,6 @@ from synapse.http.server import ( from synapse.http.site import SynapseSite from synapse.logging.context import LoggingContext from synapse.metrics import METRICS_PREFIX, MetricsResource, RegistryProxy -from synapse.python_dependencies import check_requirements from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -70,6 +69,7 @@ from synapse.rest.synapse.client import build_synapse_client_resource_tree from synapse.rest.well_known import well_known_resource from synapse.server import HomeServer from synapse.storage import DataStore +from synapse.util.check_dependencies import check_requirements from synapse.util.httpresourcetree import create_resource_tree from synapse.util.module_loader import load_module |