mirror of https://github.com/pypa/pip
Merge pull request #7873 from hroncok/no_copy_self
Prevent infinite recursion with pip wheel with $TMPDIR in $PWD
This commit is contained in:
commit
81f1054865
|
@ -0,0 +1 @@
|
||||||
|
Prevent an infinite recursion with ``pip wheel`` when ``$TMPDIR`` is within the source directory.
|
|
@ -156,13 +156,25 @@ def _copy2_ignoring_special_files(src, dest):
|
||||||
|
|
||||||
def _copy_source_tree(source, target):
|
def _copy_source_tree(source, target):
|
||||||
# type: (str, str) -> None
|
# type: (str, str) -> None
|
||||||
|
target_abspath = os.path.abspath(target)
|
||||||
|
target_basename = os.path.basename(target_abspath)
|
||||||
|
target_dirname = os.path.dirname(target_abspath)
|
||||||
|
|
||||||
def ignore(d, names):
|
def ignore(d, names):
|
||||||
# type: (str, List[str]) -> List[str]
|
# type: (str, List[str]) -> List[str]
|
||||||
# Pulling in those directories can potentially be very slow,
|
skipped = [] # type: List[str]
|
||||||
# exclude the following directories if they appear in the top
|
if d == source:
|
||||||
# level dir (and only it).
|
# Pulling in those directories can potentially be very slow,
|
||||||
# See discussion at https://github.com/pypa/pip/pull/6770
|
# exclude the following directories if they appear in the top
|
||||||
return ['.tox', '.nox'] if d == source else []
|
# level dir (and only it).
|
||||||
|
# See discussion at https://github.com/pypa/pip/pull/6770
|
||||||
|
skipped += ['.tox', '.nox']
|
||||||
|
if os.path.abspath(d) == target_dirname:
|
||||||
|
# Prevent an infinite recursion if the target is in source.
|
||||||
|
# This can happen when TMPDIR is set to ${PWD}/...
|
||||||
|
# and we copy PWD to TMPDIR.
|
||||||
|
skipped += [target_basename]
|
||||||
|
return skipped
|
||||||
|
|
||||||
kwargs = dict(ignore=ignore, symlinks=True) # type: CopytreeKwargs
|
kwargs = dict(ignore=ignore, symlinks=True) # type: CopytreeKwargs
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
from setuptools import Extension, setup
|
||||||
|
|
||||||
|
module = Extension('extension', sources=['extension.c'])
|
||||||
|
setup(name='extension', version='0.0.1', ext_modules = [module])
|
|
@ -1,6 +1,7 @@
|
||||||
"""'pip wheel' tests"""
|
"""'pip wheel' tests"""
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
import sys
|
||||||
from os.path import exists
|
from os.path import exists
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
@ -289,6 +290,24 @@ def test_pip_wheel_with_user_set_in_config(script, data, common_wheels):
|
||||||
assert "Successfully built withpyproject" in result.stdout, result.stdout
|
assert "Successfully built withpyproject" in result.stdout, result.stdout
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.skipif(sys.platform.startswith('win'),
|
||||||
|
reason='The empty extension module does not work on Win')
|
||||||
|
def test_pip_wheel_ext_module_with_tmpdir_inside(script, data, common_wheels):
|
||||||
|
tmpdir = data.src / 'extension/tmp'
|
||||||
|
tmpdir.mkdir()
|
||||||
|
script.environ['TMPDIR'] = str(tmpdir)
|
||||||
|
|
||||||
|
# To avoid a test dependency on a C compiler, we set the env vars to "noop"
|
||||||
|
# The .c source is empty anyway
|
||||||
|
script.environ['CC'] = script.environ['LDSHARED'] = str('true')
|
||||||
|
|
||||||
|
result = script.pip(
|
||||||
|
'wheel', data.src / 'extension',
|
||||||
|
'--no-index', '-f', common_wheels
|
||||||
|
)
|
||||||
|
assert "Successfully built extension" in result.stdout, result.stdout
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.network
|
@pytest.mark.network
|
||||||
def test_pep517_wheels_are_not_confused_with_other_files(script, tmpdir, data):
|
def test_pep517_wheels_are_not_confused_with_other_files(script, tmpdir, data):
|
||||||
"""Check correct wheels are copied. (#6196)
|
"""Check correct wheels are copied. (#6196)
|
||||||
|
|
Loading…
Reference in New Issue