diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2019-09-11 18:07:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 18:07:45 +0100 |
| commit | b3ef77b2085dc8d66d178a2f7d2047a9ca207309 (patch) | |
| tree | 59b29ad80ec61296572c53e38443fa91d71dd8bf /setuptools/tests/test_integration.py | |
| parent | 7f7780e5b572d6fcacd63bf99389dd9f48c5345c (diff) | |
| parent | cb64d3a84fab15aacbdf31a0a5632690ca9f49b2 (diff) | |
| download | external_python_setuptools-b3ef77b2085dc8d66d178a2f7d2047a9ca207309.tar.gz external_python_setuptools-b3ef77b2085dc8d66d178a2f7d2047a9ca207309.tar.bz2 external_python_setuptools-b3ef77b2085dc8d66d178a2f7d2047a9ca207309.zip | |
Merge branch 'master' into feature/deterministic-provides-extras
Diffstat (limited to 'setuptools/tests/test_integration.py')
| -rw-r--r-- | setuptools/tests/test_integration.py | 5 |
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') |