diff options
| author | Benoit Pierre <benoit.pierre@gmail.com> | 2019-05-14 15:24:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 15:24:45 +0000 |
| commit | 6310f99fd48cce9c01827bca8a7ffd82d2182a4c (patch) | |
| tree | 9e7393ed471093a5910bcb549df24c4489d83eb6 | |
| parent | 83c667e0b2a98193851c07115d1af65011ed0fb6 (diff) | |
| parent | 835580ae8926fc6ca7560ab7421387e3ba47242c (diff) | |
| download | python-setuptools-git-6310f99fd48cce9c01827bca8a7ffd82d2182a4c.tar.gz | |
Merge pull request #1762 from benoit-pierre/fix_test_build_deps_on_distutils
Fix CIs.
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_integration.py | 5 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml index 7a3d174d..08818069 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ cache: test_script: - python --version - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel - - pip install --upgrade tox tox-venv + - pip install --upgrade tox tox-venv virtualenv - pip freeze --all - python bootstrap.py - tox -- --cov 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') @@ -14,7 +14,7 @@ deps=-rtests/requirements.txt # from being added to `sys.path`. install_command=python -c 'import sys; sys.path.remove(""); from pkg_resources import load_entry_point; load_entry_point("pip", "console_scripts", "pip")()' install {opts} {packages} # Same as above. -list_dependencies_command={envbindir}/pip freeze +list_dependencies_command={envbindir}/pip freeze --all setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname} # TODO: The passed environment variables came from copying other tox.ini files # These should probably be individually annotated to explain what needs them. |