diff options
| author | Paul Ganssle <paul@ganssle.io> | 2018-11-02 20:38:43 -0400 |
|---|---|---|
| committer | Paul Ganssle <paul@ganssle.io> | 2018-11-02 20:53:01 -0400 |
| commit | 7a3e4b4169d5f65714f1302aff6c420237ff9295 (patch) | |
| tree | 527f4ad4b9ba9eb8b98313aa03025229ce8bd20c | |
| parent | 6ed6fe8def487aa77ee67d5ab3adcb2b66814831 (diff) | |
| download | external_python_setuptools-7a3e4b4169d5f65714f1302aff6c420237ff9295.tar.gz external_python_setuptools-7a3e4b4169d5f65714f1302aff6c420237ff9295.tar.bz2 external_python_setuptools-7a3e4b4169d5f65714f1302aff6c420237ff9295.zip | |
Add futures backport to test reqs
`setuptools.tests.test_build_meta` relies on the Python 3 feature
`concurrent.futures` to run, and as a result has been silently skipped
in Python 2.7. This adds the `futures` backport to the 2.7 test
requirements and turns the `pytest.importorskip` invocations in test_build_meta
into standard import statements.
| -rw-r--r-- | setuptools/tests/test_build_meta.py | 5 | ||||
| -rw-r--r-- | tests/requirements.txt | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py index c5f4dcaa..2dc45bc4 100644 --- a/setuptools/tests/test_build_meta.py +++ b/setuptools/tests/test_build_meta.py @@ -11,8 +11,9 @@ from . import py2_only __metaclass__ = type -futures = pytest.importorskip('concurrent.futures') -importlib = pytest.importorskip('importlib') +# Backports on Python 2.7 +import importlib +from concurrent import futures class BuildBackendBase: diff --git a/tests/requirements.txt b/tests/requirements.txt index b38fcbf0..0c6c3e59 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -8,3 +8,4 @@ wheel coverage>=4.5.1 pytest-cov>=2.5.1 paver; python_version>="3.6" +futures; python_version=="2.7" |