diff options
author | David Robertson <davidr@element.io> | 2022-10-07 15:15:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-07 15:15:10 +0100 |
commit | f1673866ed8a39d49e2caaa6f4255a3f696bc3b4 (patch) | |
tree | 21dbc9fa07624bd5685c4650efb6c23220610b1f /pyproject.toml | |
parent | Update 1.69.0rc2 changelog (diff) | |
download | synapse-f1673866ed8a39d49e2caaa6f4255a3f696bc3b4.tar.xz |
Unpin build-system requirements, but impose an upper-bound (#14085)
* Revert to prior build-system requirements This reverts #14080. * Use normalised extra name, which poetry-core 1.3 will generate anyway * Changelog * Upper bound build-system requirements * Remove upgrade note; expand changelog entry a little. * Fix typo in build-system comment Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Diffstat (limited to 'pyproject.toml')
-rw-r--r-- | pyproject.toml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pyproject.toml b/pyproject.toml index 622d6a9e89..81b2659eb1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -219,7 +219,7 @@ oidc = ["authlib"] # `systemd.journal.JournalHandler`, as is documented in # `contrib/systemd/log_config.yaml`. systemd = ["systemd-python"] -url_preview = ["lxml"] +url-preview = ["lxml"] sentry = ["sentry-sdk"] opentracing = ["jaeger-client", "opentracing"] jwt = ["authlib"] @@ -250,7 +250,7 @@ all = [ "pysaml2", # oidc and jwt "authlib", - # url_preview + # url-preview "lxml", # sentry "sentry-sdk", @@ -307,7 +307,12 @@ twine = "*" towncrier = ">=18.6.0rc1" [build-system] -requires = ["poetry-core==1.2.0", "setuptools_rust==1.5.2"] +# The upper bounds here are defensive, intended to prevent situations like +# #13849 and #14079 where we see buildtime or runtime errors caused by build +# system changes. +# We are happy to raise these upper bounds upon request, +# provided we check that it's safe to do so (i.e. that CI passes). +requires = ["poetry-core>=1.0.0,<=1.3.1", "setuptools_rust>=1.3,<=1.5.2"] build-backend = "poetry.core.masonry.api" |