diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2018-06-06 08:57:21 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2018-06-06 09:02:39 -0400 |
commit | 3e3b9f7968fbe47b8e7038d1b1767676daecfaca (patch) | |
tree | f505ad8e1ab242a286351fccdfa37cd3d9e20ca2 | |
parent | 9832db367961e9215a1c55703dcbe47b339ca409 (diff) | |
download | external_python_setuptools-3e3b9f7968fbe47b8e7038d1b1767676daecfaca.tar.gz external_python_setuptools-3e3b9f7968fbe47b8e7038d1b1767676daecfaca.tar.bz2 external_python_setuptools-3e3b9f7968fbe47b8e7038d1b1767676daecfaca.zip |
Include pavement.py in tests (where applicable).
-rw-r--r-- | conftest.py | 5 | ||||
-rw-r--r-- | tests/requirements.txt | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/conftest.py b/conftest.py index d966d68d..0d7b274c 100644 --- a/conftest.py +++ b/conftest.py @@ -13,10 +13,13 @@ def pytest_addoption(parser): collect_ignore = [ 'tests/manual_test.py', - 'pavement.py', 'setuptools/tests/mod_with_constant.py', ] if sys.version_info < (3,): collect_ignore.append('setuptools/lib2to3_ex.py') + + +if sys.version_info < (3, 6): + collect_ignore.append('pavement.py') diff --git a/tests/requirements.txt b/tests/requirements.txt index aff32c10..a8cde395 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -8,3 +8,4 @@ pytest>=3.0.2 wheel coverage>=4.5.1 pytest-cov>=2.5.1 +paver; python_version>="3.6" |