diff options
Diffstat (limited to 'net-im/py-matrix-synapse/files')
| -rw-r--r-- | net-im/py-matrix-synapse/files/patch-pyproject.toml | 15 | ||||
| -rw-r--r-- | net-im/py-matrix-synapse/files/patch-setup.py | 10 |
2 files changed, 18 insertions, 7 deletions
diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml index acbd690b99f2..ea97936dfb6f 100644 --- a/net-im/py-matrix-synapse/files/patch-pyproject.toml +++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml @@ -1,6 +1,15 @@ ---- pyproject.toml.orig 2022-09-27 11:37:18 UTC +--- pyproject.toml.orig 2023-03-28 10:30:20 UTC +++ pyproject.toml -@@ -162,7 +162,7 @@ bleach = ">=1.4.3" +@@ -156,7 +156,7 @@ jsonschema = ">=3.0.0" + # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41 + # We cannot test our wheels against the 2.3.5 release in CI. Putting in an upper bound for this + # because frozendict has been more trouble than it's worth; we would like to move to immutabledict. +-frozendict = ">=1,!=2.1.2,<2.3.5" ++frozendict = ">=1" + # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0 + unpaddedbase64 = ">=2.1.0" + # We require 1.5.0 to work around an issue when running against the C implementation of +@@ -199,7 +199,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. @@ -9,7 +18,7 @@ # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.3.0" -@@ -173,17 +173,6 @@ packaging = ">=16.1" +@@ -210,17 +210,6 @@ packaging = ">=16.1" importlib_metadata = { version = ">=1.4", python = "<3.8" } # This is the most recent version of Pydantic with available on common distros. pydantic = ">=1.7.4" diff --git a/net-im/py-matrix-synapse/files/patch-setup.py b/net-im/py-matrix-synapse/files/patch-setup.py index 9292c52a2214..36446364bf7e 100644 --- a/net-im/py-matrix-synapse/files/patch-setup.py +++ b/net-im/py-matrix-synapse/files/patch-setup.py @@ -1,19 +1,21 @@ --- setup.py.orig 1970-01-01 00:00:00 UTC +++ setup.py -@@ -149,7 +149,7 @@ install_requires = \ +@@ -154,8 +154,8 @@ install_requires = \ 'bcrypt>=3.1.7', 'bleach>=1.4.3', 'canonicaljson>=1.5.0,<2.0.0', - 'cryptography>=3.4.7', +- 'frozendict>=1,!=2.1.2,<2.3.5', + 'cryptography', - 'frozendict>=1,!=2.1.2', ++ 'frozendict>=1', 'ijson>=3.1.4', 'jsonschema>=3.0.0', -@@ -165,7 +165,6 @@ install_requires = \ + 'matrix-common>=1.3.0,<2.0.0', +@@ -170,7 +170,6 @@ install_requires = \ 'pydantic>=1.7.4', 'pymacaroons>=0.13.0', 'service-identity>=18.1.0', - 'setuptools_rust>=1.3', 'signedjson>=1.1.0,<2.0.0', - 'sortedcontainers>=1.4.4', + 'sortedcontainers>=1.5.2', 'treq>=15.1', |