Skip to content

Commit

Permalink
Merge pull request #7873 from hroncok/no_copy_self
Browse files Browse the repository at this point in the history
Prevent infinite recursion with pip wheel with $TMPDIR in $PWD
  • Loading branch information
pradyunsg committed Apr 10, 2020
2 parents 6c97645 + eb070d2 commit 81f1054
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 5 deletions.
1 change: 1 addition & 0 deletions news/7872.bugfix
@@ -0,0 +1 @@
Prevent an infinite recursion with ``pip wheel`` when ``$TMPDIR`` is within the source directory.
22 changes: 17 additions & 5 deletions src/pip/_internal/operations/prepare.py
Expand Up @@ -156,13 +156,25 @@ def _copy2_ignoring_special_files(src, dest):

def _copy_source_tree(source, target):
# 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):
# type: (str, List[str]) -> List[str]
# Pulling in those directories can potentially be very slow,
# exclude the following directories if they appear in the top
# level dir (and only it).
# See discussion at https://github.com/pypa/pip/pull/6770
return ['.tox', '.nox'] if d == source else []
skipped = [] # type: List[str]
if d == source:
# Pulling in those directories can potentially be very slow,
# exclude the following directories if they appear in the top
# 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

Expand Down
Empty file.
4 changes: 4 additions & 0 deletions tests/data/src/extension/setup.py
@@ -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])
19 changes: 19 additions & 0 deletions tests/functional/test_wheel.py
@@ -1,6 +1,7 @@
"""'pip wheel' tests"""
import os
import re
import sys
from os.path import exists

import pytest
Expand Down Expand Up @@ -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


@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
def test_pep517_wheels_are_not_confused_with_other_files(script, tmpdir, data):
"""Check correct wheels are copied. (#6196)
Expand Down

0 comments on commit 81f1054

Please sign in to comment.