From 79249632767530faba53290a5970af8382aef700 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 26 Jun 2020 19:08:21 +0930 Subject: [PATCH] Remove tox and update dependencies --- MANIFEST.in | 1 - dev-requirements.txt | 2 +- requirements.txt | 6 +++--- setup.py | 1 + tox.ini | 17 ----------------- win-requirements.txt | 2 +- 6 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 tox.ini diff --git a/MANIFEST.in b/MANIFEST.in index 38cadc48..438d9f6e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,7 +2,6 @@ include README.rst include AUTHORS include LICENSE include MANIFEST.in -include tox.ini include requirements.txt recursive-include tests * recursive-exclude docs * diff --git a/dev-requirements.txt b/dev-requirements.txt index 4f92f379..afc5a106 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,5 +2,5 @@ pytest==5.4.3 flake8==3.8.3 -pytest-timeout==1.3.3 +pytest-timeout==1.4.1 pytest-aiohttp==0.3.0 diff --git a/requirements.txt b/requirements.txt index 368791af..2fba1cd1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ jsonschema==3.2.0 aiohttp==3.6.2 aiohttp-cors==0.7.0 -aiofiles==0.4.0 +aiofiles==0.5.0 Jinja2>=2.7.3 sentry-sdk>=0.14.4 -psutil==5.6.7 +psutil==5.7.0 async-timeout==3.0.1 distro>=1.3.0 -py-cpuinfo==5.0.0 +py-cpuinfo==6.0.0 diff --git a/setup.py b/setup.py index 39665c36..8a0c2fc7 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ class PyTest(TestCommand): errcode = pytest.main(self.test_args) sys.exit(errcode) + dependencies = open("requirements.txt", "r").read().splitlines() setup( diff --git a/tox.ini b/tox.ini deleted file mode 100644 index bd0fe746..00000000 --- a/tox.ini +++ /dev/null @@ -1,17 +0,0 @@ -[tox] -envlist = py34 - -[testenv] -commands = python setup.py test -deps = -rdev-requirements.txt - -[pep8] -ignore = E501,E402,E265 - -[flake8] -ignore = E265,E501 -exclude = tests/* - -[pytest] -norecursedirs = .tox -timeout = 15 diff --git a/win-requirements.txt b/win-requirements.txt index 851b9264..923d8682 100644 --- a/win-requirements.txt +++ b/win-requirements.txt @@ -1,4 +1,4 @@ -rrequirements.txt pywin32>=223 # pyup: ignore -wmi==1.4.9 +wmi==1.5.1