From b4d42a84e22652c16b914a2f76421718be913027 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 17 Oct 2018 11:49:47 -0400 Subject: [PATCH] block py.test 3.9.1 references: https://github.com/pytest-dev/pytest/issues/4181 Change-Id: I216fde19dd0f5c4910d76c08400f2329b09ad584 --- setup.py | 4 ++-- tox.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 0bf6623e99..b9e999f0d1 100644 --- a/setup.py +++ b/setup.py @@ -139,7 +139,7 @@ def run_setup(with_cext): package_dir={'': 'lib'}, license="MIT License", cmdclass=cmdclass, - tests_require=['pytest >= 2.5.2', 'mock', 'pytest-xdist'], + tests_require=['pytest>=2.5.2,!=3.9.1', 'mock', 'pytest-xdist'], long_description=readme, python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*", classifiers=[ @@ -164,7 +164,7 @@ def run_setup(with_cext): 'mysql': ['mysqlclient'], 'pymysql': ['pymysql'], 'postgresql': ['psycopg2'], - 'postgresql_psycopg2binary': ['psycopg2-binary'], + 'postgresql_psycopg2binary': ['psycopg2-binary'], 'postgresql_pg8000': ['pg8000'], 'postgresql_psycopg2cffi': ['psycopg2cffi'], 'oracle': ['cx_oracle'], diff --git a/tox.ini b/tox.ini index 96c74b3aab..a1a4c49043 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ install_command=python -m pip install {env:TOX_PIP_OPTS:} {opts} {packages} usedevelop= cov: True -deps=pytest +deps=pytest!=3.9.1 pytest-xdist mock # needed only for correct profiling results -- 2.47.3