From: Mike Bayer Date: Wed, 17 Oct 2018 15:49:47 +0000 (-0400) Subject: block py.test 3.9.1 X-Git-Tag: rel_1_2_13~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a083dcbb853343ff4a7dc6000f2e32474fa6125;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git block py.test 3.9.1 references: https://github.com/pytest-dev/pytest/issues/4181 Change-Id: I216fde19dd0f5c4910d76c08400f2329b09ad584 (cherry picked from commit b4d42a84e22652c16b914a2f76421718be913027) --- diff --git a/setup.py b/setup.py index 6922b7d21a..8e56be59d6 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, classifiers=[ "Development Status :: 5 - Production/Stable", @@ -157,7 +157,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 f7c5fd5c8b..4dace3934d 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ cov_args=--cov=sqlalchemy --cov-report term --cov-append --cov-report xml --excl usedevelop= cov: True -deps=pytest +deps=pytest!=3.9.1 pytest-xdist mock # needed only for correct profiling results