From 2fdc262498c8c63b874f240ebd9af801b2eb4ac4 Mon Sep 17 00:00:00 2001 From: yeger Date: Sun, 9 Jun 2019 14:32:24 -0400 Subject: [PATCH] adding deps to tox --- .travis.yml | 4 ++-- requirements.txt | 1 + setup.py | 6 +----- tox.ini | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 requirements.txt diff --git a/.travis.yml b/.travis.yml index 04bc3c2..74d375b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ python: # - "3.6-dev" # 3.6 development branch # - "3.7-dev" # 3.7 development branch # command to install dependencies -#install: -# - pip install -r requirements.txt +install: + - pip install -r requirements.txt # command to run tests script: - pytest diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..4a2300c --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +enum ; python_version < '3.4' diff --git a/setup.py b/setup.py index edbd494..ed6ca96 100644 --- a/setup.py +++ b/setup.py @@ -21,9 +21,6 @@ class PyTest(TestCommand): sys.exit(errno) -install_requires=["enum34;python_version<'3.4'"] -tests_require=["pytest", "pytest_mock"] + install_requires - setup( name="pylspclient", version="0.0.2", @@ -34,7 +31,6 @@ setup( long_description_content_type="text/markdown", url="https://github.com/yeger00/pylspclient", packages=find_packages(), - install_requires=install_requires, - tests_require=tests_require, + tests_require=["pytest", "pytest_mock"], cmdclass={"test": PyTest}, ) diff --git a/tox.ini b/tox.ini index 5c6210d..a439dad 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,6 @@ envlist = py27,py36 [testenv] +deps=-r{toxinidir}/requirements.txt commands = python setup.py test