From b3346dbfce5079a6977c4c3aedc438f21114f8c9 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Thu, 24 Jan 2019 11:07:49 +0100 Subject: [PATCH] fix deprecated option in setup.py --- setup.py | 5 +---- tox.ini | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 6049f397..5c71f2c4 100644 --- a/setup.py +++ b/setup.py @@ -54,9 +54,6 @@ def exec_file(names): 'test': ['pytest', 'responses'], 'doc': ['Sphinx==1.4.6', 'sphinx-rtd-theme==0.1.9', 'sphinxcontrib-napoleon==0.5.3'], 'format': ['flake8'], - 'e2e': ['python-olm==dev', 'canonicaljson'] + 'e2e': ['python-olm @ git+https://github.com/poljar/python-olm.git@4752eb22f005cb9f6143857008572e6d83252841', 'canonicaljson'] }, - dependency_links=[ - 'git+https://github.com/poljar/python-olm.git@4752eb22f005cb9f6143857008572e6d83252841#egg=python-olm-dev' - ] ) diff --git a/tox.ini b/tox.ini index bde77162..205432ac 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ commands= coverage run --source=matrix_client setup.py test coverage report - coveralls -install_command = pip install --process-dependency-links {opts} {packages} +install_command = pip install {opts} {packages} [testenv:pep8] skip_install = True