From c259263f26ee068c56d4ff8483d59f17586911a3 Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Fri, 4 Aug 2017 14:01:26 +0200 Subject: [PATCH] blacklist pytest 3.2.0 because it breaks our tests see pytest-dev/pytest#2644 for reference --- doc/requirements.txt | 1 + setup.py | 2 +- tox.ini | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 682316c..9f38356 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -5,3 +5,4 @@ pyserial sphinx-rtd-theme setuptools-scm docutils>=0.12 +viivakoodi diff --git a/setup.py b/setup.py index 60a9209..f048bea 100755 --- a/setup.py +++ b/setup.py @@ -126,7 +126,7 @@ setup( tests_require=[ 'jaconv', 'tox', - 'pytest', + 'pytest!=3.2.0', 'pytest-cov', 'pytest-mock', 'nose', diff --git a/tox.ini b/tox.ini index a6e6fca..a61a4a8 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ deps = nose coverage scripttest mock - pytest + pytest!=3.2.0 pytest-cov pytest-mock hypothesis @@ -19,6 +19,7 @@ basepython = python changedir = doc deps = sphinx>=1.5.1 setuptools_scm + viivakoodi commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html [testenv:flake8]