diff options
| author | Erik Johnston <erik@matrix.org> | 2020-11-18 12:13:38 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-11-18 12:13:38 +0000 |
| commit | b690542a34cc51b1f6ed186f9cb89668ef21a1f3 (patch) | |
| tree | 04f74d785902960b4df660b76e2fef69dab3db4e /synapse | |
| parent | Merge pull request #8761 from matrix-org/rav/test_request_rendering (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-b690542a34cc51b1f6ed186f9cb89668ef21a1f3.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 537f2239e5..65c1f5aa3f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.23.0rc1" +__version__ = "1.23.0" 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 diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 0ddead8a0f..aab77fc453 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -72,6 +72,10 @@ REQUIREMENTS = [ # prom-client has a history of breaking backwards compatibility between # minor versions (https://github.com/prometheus/client_python/issues/317), # so we also pin the minor version. + # + # Note that we replicate these constraints in the Synapse Dockerfile while + # pre-installing dependencies. If these constraints are updated here, the + # same change should be made in the Dockerfile. "prometheus_client>=0.4.0,<0.9.0", # we use attr.validators.deep_iterable, which arrived in 19.1.0 (Note: # Fedora 31 only has 19.1, so if we want to upgrade we should wait until 33 |