Merge branch 'master' into feature/deps-in-metadata

4d689db2 · Jason R. Coombs · GitHub · d92f778b · 2e00ba35 · 4d689db2
Commit 4d689db2 authored Jan 20, 2020 by Jason R. Coombs Committed by GitHub Jan 20, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

changelog.d/1905.change.rst changelog.d/1905.change.rst +1 -1

setuptools/tests/requirements.txt setuptools/tests/requirements.txt +12 -0

No files found.
--- a/changelog.d/1905.change.rst
+++ b/changelog.d/1905.change.rst
-Fixed test failure introduced in 41.6.0 when the 'tests' directory is not present.
+Fixed defect in _imp, introduced in 41.6.0 when the 'tests' directory is not present.
--- a/setuptools/tests/requirements.txt
+++ b/setuptools/tests/requirements.txt
+mock
+pytest-flake8
+flake8-2020; python_version>="3.6"
+virtualenv>=13.0.0
+pytest-virtualenv>=1.2.7
+pytest>=3.7
+wheel
+coverage>=4.5.1
+pytest-cov>=2.5.1
+paver; python_version>="3.6"
+futures; python_version=="2.7"
+pip>=19.1 # For proper file:// URLs support.