From 78cd88a0baad559d9bb4e336af7e4c981cc3ac12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 11:03:11 +0000 Subject: [PATCH 1/2] build(deps): bump matrix-client from 0.3.2 to 0.4.0 in /requirements Bumps [matrix-client](https://github.com/matrix-org/matrix-python-sdk) from 0.3.2 to 0.4.0. - [Release notes](https://github.com/matrix-org/matrix-python-sdk/releases) - [Commits](https://github.com/matrix-org/matrix-python-sdk/compare/v0.3.2...v0.4.0) --- updated-dependencies: - dependency-name: matrix-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements/requirements-ci.txt | 3 ++- requirements/requirements-dev.txt | 3 ++- requirements/requirements.in | 2 +- requirements/requirements.txt | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/requirements/requirements-ci.txt b/requirements/requirements-ci.txt index d613a86480..9a30537a48 100644 --- a/requirements/requirements-ci.txt +++ b/requirements/requirements-ci.txt @@ -378,7 +378,7 @@ matplotlib-inline==0.1.2 # via # -r requirements-dev.txt # ipython -matrix-client==0.3.2 +matrix-client==0.4.0 # via -r requirements-dev.txt matrix-synapse==1.33.0 # via -r requirements-dev.txt @@ -777,6 +777,7 @@ unpaddedbase64==1.1.0 urllib3==1.26.5 # via # -r requirements-dev.txt + # matrix-client # requests # responses varint==1.0.2 diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 863845c9b8..cb10ed1e40 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -334,7 +334,7 @@ marshmallow-polyfield==5.10 # via -r requirements.txt matplotlib-inline==0.1.2 # via ipython -matrix-client==0.3.2 +matrix-client==0.4.0 # via -r requirements.txt matrix-synapse==1.33.0 # via -r requirements-dev.in @@ -657,6 +657,7 @@ unpaddedbase64==1.1.0 urllib3==1.26.5 # via # -r requirements.txt + # matrix-client # requests # responses varint==1.0.2 diff --git a/requirements/requirements.in b/requirements/requirements.in index 6902f2ab32..1494282615 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -21,7 +21,7 @@ marshmallow-dataclass[union] marshmallow-polyfield marshmallow marshmallow_enum -matrix-client==0.3.2 +matrix-client==0.4.0 mirakuru==2.1.2 netifaces psutil diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 89c6a2cddc..febc7d1557 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -170,7 +170,7 @@ marshmallow-enum==1.5.1 # via -r requirements.in marshmallow-polyfield==5.10 # via -r requirements.in -matrix-client==0.3.2 +matrix-client==0.4.0 # via -r requirements.in mirakuru==2.1.2 # via -r requirements.in @@ -269,7 +269,9 @@ typing-inspect==0.4.0 ulid-py==1.1.0 # via -r requirements.in urllib3==1.26.5 - # via requests + # via + # matrix-client + # requests varint==1.0.2 # via multiaddr web3==5.21.0 From 70298c97a3b2bcae210b610a82a06f3901114491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Stankovi=C4=87?= Date: Mon, 2 Aug 2021 15:56:35 +0200 Subject: [PATCH 2/2] raiden: transport: add a base_url property to GMatrixHttpApi Since matrix-client 0.4.0 base_url has been renamed to _base_url. --- raiden/network/transport/matrix/client.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/raiden/network/transport/matrix/client.py b/raiden/network/transport/matrix/client.py index 19afd5c968..c686bb9a0b 100644 --- a/raiden/network/transport/matrix/client.py +++ b/raiden/network/transport/matrix/client.py @@ -108,6 +108,10 @@ def __init__( else: self.retry_delay = retry_delay + @property + def base_url(self) -> str: + return self._base_url + def _send(self, method: str, path: str, *args: Any, **kwargs: Any) -> Dict: # we use an infinite loop + time + sleep instead of gevent.Timeout # to be able to re-raise the last exception instead of declaring one beforehand