Skip to content

Commit

Permalink
Update raiden-libs, use context manager on transport fixture
Browse files Browse the repository at this point in the history
[ci integration]
  • Loading branch information
andrevmatos committed Aug 15, 2018
1 parent b8e80de commit 6d4da76
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
10 changes: 3 additions & 7 deletions raiden/tests/integration/fixtures/transport.py
Expand Up @@ -32,7 +32,6 @@ def skip_if_not_udp(request):

@pytest.fixture
def local_matrix_server(transport_config):

if not transport_config.protocol == TransportProtocol.MATRIX:
yield None
return
Expand All @@ -45,14 +44,11 @@ def local_matrix_server(transport_config):
return

# otherwise, run our own local server
matrix = HTTPExecutor(
with HTTPExecutor(
transport_config.parameters.command,
url=urljoin(server, '/_matrix/client/versions'),
method='GET',
timeout=30,
shell=True,
)

matrix.start()
yield server
matrix.stop()
):
yield server
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -16,7 +16,7 @@ netifaces==0.10.7
networkx==2.1.0
psutil==5.4.5
pycryptodome==3.6.1
raiden-libs==0.1.3
git+https://github.com/raiden-network/raiden-libs.git@3b0c83f99c6f5994d3db74fe78ded0feb13f1350#egg=raiden-libs
raiden-contracts==0.2.0
webargs==1.8.1
eth-keyfile==0.5.1
Expand Down
5 changes: 5 additions & 0 deletions setup.py
Expand Up @@ -81,6 +81,11 @@ def run(self):

install_requires_replacements = {
'git+https://github.com/LefterisJP/pystun@develop#egg=pystun': 'pystun',
(
'git+https://github.com/raiden-network/raiden-libs.git'
'@3b0c83f99c6f5994d3db74fe78ded0feb13f1350'
'#egg=raiden-libs'
): 'raiden-libs',
}

install_requires = list(set(
Expand Down

0 comments on commit 6d4da76

Please sign in to comment.