diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-03-08 15:37:35 +0000 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2022-03-08 15:37:35 +0000 |
| commit | 0dc9c5653c990687f7aa912f1b1279d94b433826 (patch) | |
| tree | c785afc95a1cd5870eb400b6616a81cc3b07b107 /synapse | |
| parent | Fix CI not attaching source distributions and wheels to the GitHub releases. ... (diff) | |
| parent | Fix silly markdown typo (diff) | |
| download | synapse-0dc9c5653c990687f7aa912f1b1279d94b433826.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/util/check_dependencies.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 674acc7135..4b00565976 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -68,7 +68,7 @@ try: except ImportError: pass -__version__ = "1.54.0rc1" +__version__ = "1.54.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/util/check_dependencies.py b/synapse/util/check_dependencies.py index 39b0a91db3..12cd804939 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -163,7 +163,8 @@ def check_requirements(extra: Optional[str] = None) -> None: deps_unfulfilled.append(requirement.name) errors.append(_not_installed(requirement, extra)) else: - if not requirement.specifier.contains(dist.version): + # We specify prereleases=True to allow prereleases such as RCs. + if not requirement.specifier.contains(dist.version, prereleases=True): deps_unfulfilled.append(requirement.name) errors.append(_incorrect_version(requirement, dist.version, extra)) |