summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
authorBenoit Pierre <benoit.pierre@gmail.com>2019-05-14 15:24:45 +0000
committerGitHub <noreply@github.com>2019-05-14 15:24:45 +0000
commit6310f99fd48cce9c01827bca8a7ffd82d2182a4c (patch)
tree9e7393ed471093a5910bcb549df24c4489d83eb6 /setuptools
parent83c667e0b2a98193851c07115d1af65011ed0fb6 (diff)
parent835580ae8926fc6ca7560ab7421387e3ba47242c (diff)
downloadpython-setuptools-git-6310f99fd48cce9c01827bca8a7ffd82d2182a4c.tar.gz
Merge pull request #1762 from benoit-pierre/fix_test_build_deps_on_distutils
Fix CIs.
Diffstat (limited to 'setuptools')
-rw-r--r--setuptools/tests/test_integration.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index e54f3209..1e132188 100644
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -141,6 +141,7 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
allowed_unknowns = [
'test_suite',
'tests_require',
+ 'python_requires',
'install_requires',
]
assert not match or match.group(1).strip('"\'') in allowed_unknowns
@@ -149,8 +150,8 @@ def test_build_deps_on_distutils(request, tmpdir_factory, build_dep):
def install(pkg_dir, install_dir):
with open(os.path.join(pkg_dir, 'setuptools.py'), 'w') as breaker:
breaker.write('raise ImportError()')
- cmd = [sys.executable, 'setup.py', 'install', '--prefix', install_dir]
- env = dict(os.environ, PYTHONPATH=pkg_dir)
+ cmd = [sys.executable, 'setup.py', 'install', '--prefix', str(install_dir)]
+ env = dict(os.environ, PYTHONPATH=str(pkg_dir))
output = subprocess.check_output(
cmd, cwd=pkg_dir, env=env, stderr=subprocess.STDOUT)
return output.decode('utf-8')