diff options
| author | Paul Ganssle <pganssle@users.noreply.github.com> | 2018-11-04 12:38:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-04 12:38:42 -0500 |
| commit | b0c746640f87ad2719a7ebfbdc226d3fd43296b6 (patch) | |
| tree | f6960b395631d72abd4ab510684c503672b7151b | |
| parent | 46af765c49f548523b8212f6e08e1edb12f22ab6 (diff) | |
| parent | b2cbe8606a12913c12b9a1fe3f5f8c0f8082c296 (diff) | |
| download | external_python_setuptools-b0c746640f87ad2719a7ebfbdc226d3fd43296b6.tar.gz external_python_setuptools-b0c746640f87ad2719a7ebfbdc226d3fd43296b6.tar.bz2 external_python_setuptools-b0c746640f87ad2719a7ebfbdc226d3fd43296b6.zip | |
Merge pull request #1572 from pganssle/import_futures_test_reqs
Add futures and backport to Python 2.7 test requirements
| -rw-r--r-- | changelog.d/1572.misc.rst | 1 | ||||
| -rw-r--r-- | setuptools/tests/test_build_meta.py | 5 | ||||
| -rw-r--r-- | tests/requirements.txt | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/1572.misc.rst b/changelog.d/1572.misc.rst new file mode 100644 index 00000000..aa3ab7ae --- /dev/null +++ b/changelog.d/1572.misc.rst @@ -0,0 +1 @@ +Added the ``concurrent.futures`` backport ``futures`` to the Python 2.7 test suite requirements. diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py index 940780cf..712e1149 100644 --- a/setuptools/tests/test_build_meta.py +++ b/setuptools/tests/test_build_meta.py @@ -13,8 +13,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" |