summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-08-03 17:18:15 -0500
committerEric Eastwood <erice@element.io>2022-08-03 17:18:15 -0500
commit9f691824d9e2a14a121c67ead4e174dcc9ae787d (patch)
tree35e39e8cf69f078431f10e5aea3f56e8a714b5d5
parentMerge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemod... (diff)
downloadsynapse-9f691824d9e2a14a121c67ead4e174dcc9ae787d.tar.xz
Move Twisted git install where it was before
-rw-r--r--pyproject.toml2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyproject.toml b/pyproject.toml

index 989d1b3a69..6c81ab8efc 100644 --- a/pyproject.toml +++ b/pyproject.toml
@@ -119,6 +119,7 @@ signedjson = "^1.1.0" service-identity = ">=18.1.0" # Twisted 18.9 introduces some logger improvements that the structured # logger utilises +twisted = {git = "https://github.com/twisted/twisted.git", rev = "trunk"} treq = ">=15.1" # Twisted has required pyopenssl 16.0 since about Twisted 16.6. pyOpenSSL = ">=16.0.0" @@ -182,7 +183,6 @@ idna = { version = ">=2.5", optional = true } opentelemetry-api = {version = "^1.11.1", optional = true} opentelemetry-sdk = {version = "^1.11.1", optional = true} opentelemetry-exporter-jaeger = {version = "^1.11.1", optional = true} -twisted = {git = "https://github.com/twisted/twisted.git", rev = "trunk"} [tool.poetry.extras] # NB: Packages that should be part of `pip install matrix-synapse[all]` need to be specified