diff options
| author | Erik Johnston <erik@matrix.org> | 2021-03-26 12:26:58 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-03-26 12:26:58 +0000 |
| commit | 019010964de1e97dc14788f980af7f0943b9168c (patch) | |
| tree | 54a7121169aa821adc4fce1cbc14f0bf8047289b /synapse | |
| parent | Preserve host in example apache config (#9696) (diff) | |
| parent | Update cahngelog (diff) | |
| download | synapse-019010964de1e97dc14788f980af7f0943b9168c.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 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 8e57739cd2..c9bc8fb9e9 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.30.0" +__version__ = "1.30.1" 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 321a333820..14ddaed026 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,6 +82,9 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", + # We enforce that we have a `cryptography` version that bundles an `openssl` + # with the latest security patches. + "cryptography>=3.4.7;python_version>='3.6'", ] CONDITIONAL_REQUIREMENTS = { |