summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-08-03 16:10:10 -0500
committerEric Eastwood <erice@element.io>2022-08-03 16:10:10 -0500
commitf5da762960afa57921c575a99262d3351984dd37 (patch)
tree4335e41160679e2322b92f5240a8530e27125fe1
parentUpdate treq to match minimum Twisted Python versions (diff)
downloadsynapse-f5da762960afa57921c575a99262d3351984dd37.tar.xz
Revert "Update treq to match minimum Twisted Python versions"
This reverts commit 270db429cd8bd05032ddde0a4b48da811dd26276.
-rw-r--r--poetry.lock25
-rw-r--r--pyproject.toml4
2 files changed, 12 insertions, 17 deletions
diff --git a/poetry.lock b/poetry.lock

index d94c0a0bf6..a78ceb0ae5 100644 --- a/poetry.lock +++ b/poetry.lock
@@ -1267,22 +1267,17 @@ telegram = ["requests"] [[package]] name = "treq" -version = "22.2.0" -description = "High-level Twisted HTTP Client API" +version = "15.1.0" +description = "A requests-like API built on top of twisted.web's Agent" category = "main" optional = false -python-versions = ">=3.6" +python-versions = "*" [package.dependencies] -attrs = "*" -hyperlink = ">=21.0.0" -incremental = "*" +pyOpenSSL = {version = ">=0.15.1", markers = "python_version > \"3.0\""} requests = ">=2.1.0" -Twisted = {version = ">=18.7.0", extras = ["tls"]} - -[package.extras] -dev = ["pep8", "pyflakes", "httpbin (==0.5.0)"] -docs = ["sphinx (>=1.4.8)"] +service_identity = ">=14.0.0" +Twisted = {version = ">=15.5.0", markers = "python_version > \"3.0\""} [[package]] name = "twine" @@ -1309,7 +1304,7 @@ name = "Twisted" version = "22.4.0.post0" description = "An asynchronous networking framework written in Python" category = "main" -optional = true +optional = false python-versions = ">=3.7.1" develop = false @@ -1620,7 +1615,7 @@ url_preview = ["lxml"] [metadata] lock-version = "1.1" python-versions = "^3.7.1" -content-hash = "b3cf8776561c62340d50bf8a07b99e25fd67f2063075ceb0047946c4314c5882" +content-hash = "c2cfbb348a49e088c404148c1b682fc5af5abb6278cf4479c6a51fff1656328c" [metadata.files] attrs = [ @@ -2647,8 +2642,8 @@ tqdm = [ {file = "tqdm-4.63.0.tar.gz", hash = "sha256:1d9835ede8e394bb8c9dcbffbca02d717217113adc679236873eeaac5bc0b3cd"}, ] treq = [ - {file = "treq-22.2.0-py3-none-any.whl", hash = "sha256:27d95b07c5c14be3e7b280416139b036087617ad5595be913b1f9b3ce981b9b2"}, - {file = "treq-22.2.0.tar.gz", hash = "sha256:df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec"}, + {file = "treq-15.1.0-py2.py3-none-any.whl", hash = "sha256:1ad1ba89ddc62ae877084b290bd327755b13f6e7bc7076dc4d8e2efb701bfd63"}, + {file = "treq-15.1.0.tar.gz", hash = "sha256:425a47d5d52a993d51211028fb6ade252e5fbea094e878bb4b644096a7322de8"}, ] twine = [ {file = "twine-3.8.0-py3-none-any.whl", hash = "sha256:d0550fca9dc19f3d5e8eadfce0c227294df0a2a951251a4385797c8a6198b7c8"}, diff --git a/pyproject.toml b/pyproject.toml
index 7780379e26..989d1b3a69 100644 --- a/pyproject.toml +++ b/pyproject.toml
@@ -119,8 +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 = ">=22.2.0" +treq = ">=15.1" # Twisted has required pyopenssl 16.0 since about Twisted 16.6. pyOpenSSL = ">=16.0.0" PyYAML = ">=3.11" @@ -183,6 +182,7 @@ 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