Skip to content

Commit

Permalink
Merge pull request #9636 from dwt/master
Browse files Browse the repository at this point in the history
  • Loading branch information
uranusjr authored Feb 28, 2021
2 parents 8223d29 + 7b25489 commit 550270c
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
1 change: 1 addition & 0 deletions news/4390.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed ``--target`` to work with ``--editable`` installs.
2 changes: 1 addition & 1 deletion src/pip/_internal/utils/setuptools_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def make_setuptools_develop_args(
if prefix:
args += ["--prefix", prefix]
if home is not None:
args += ["--home", home]
args += ["--install-dir", home]

if use_user_site:
args += ["--user", "--prefix="]
Expand Down
22 changes: 22 additions & 0 deletions tests/functional/test_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,28 @@ def test_install_editable_with_prefix(script):
result.did_create(install_path)


@pytest.mark.network
def test_install_editable_with_target(script):
pkg_path = script.scratch_path / 'pkg'
pkg_path.mkdir()
pkg_path.joinpath("setup.py").write_text(textwrap.dedent("""
from setuptools import setup
setup(
name='pkg',
install_requires=['watching_testrunner']
)
"""))

target = script.scratch_path / 'target'
target.mkdir()
result = script.pip(
'install', '--editable', pkg_path, '--target', target
)

result.did_create(script.scratch / 'target' / 'pkg.egg-link')
result.did_create(script.scratch / 'target' / 'watching_testrunner.py')


def test_install_package_conflict_prefix_and_user(script, data):
"""
Test installing a package using pip install --prefix --user errors out
Expand Down

0 comments on commit 550270c

Please sign in to comment.