From 70988c2f1070ad3041a28e38222478785b0fcebf Mon Sep 17 00:00:00 2001 From: diginc Date: Thu, 5 Oct 2017 14:24:30 -0500 Subject: [PATCH] tox + sped up parallel pytest --- .gitignore | 3 +++ .travis.yml | 8 +++----- setup.py | 6 ++++++ tox.ini | 6 ++++++ 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 setup.py create mode 100644 tox.ini diff --git a/.gitignore b/.gitignore index ee90b85..cea8ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ *.pyc .cache __pycache__ +.tox +.eggs +UNKNOWN.egg-info # WIP/test stuff doco.yml diff --git a/.travis.yml b/.travis.yml index 4732fba..2b549f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,9 @@ services: language: python python: - "2.7" -install: - - pip install -r requirements.txt -script: +script: # prepare qemu - docker run --rm --privileged multiarch/qemu-user-static:register --reset - # run docker build & tests - - py.test -vv test/ + # requirements, build docker, and tests + - tox diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..0e393bc --- /dev/null +++ b/setup.py @@ -0,0 +1,6 @@ +from setuptools import setup + +setup( + setup_requires=['pytest-runner'], + tests_require=['pytest'], +) diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..2714a20 --- /dev/null +++ b/tox.ini @@ -0,0 +1,6 @@ +[tox] +envlist = py27 + +[testenv] +deps = -rrequirements.txt +commands = pytest {posargs:-vv -n auto} ./test