Skip to content

Commit 52299a7

Browse files
committed
pip wheel needs --src option if it's going support --editable for vcs reqs
1 parent 1203417 commit 52299a7

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

pip/cmdoptions.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"""
1010
import copy
1111
from optparse import OptionGroup, SUPPRESS_HELP, Option
12-
from pip.locations import build_prefix, default_log_file
12+
from pip.locations import build_prefix, default_log_file, src_prefix
1313

1414

1515
def make_option_group(group, parser):
@@ -296,6 +296,16 @@ def make(self):
296296
'"develop mode") from a local project path or a VCS url.'),
297297
)
298298

299+
src = OptionMaker(
300+
'--src', '--source', '--source-dir', '--source-directory',
301+
dest='src_dir',
302+
metavar='dir',
303+
default=src_prefix,
304+
help='Directory to check out editable projects into. '
305+
'The default in a virtualenv is "<venv path>/src". '
306+
'The default for global installs is "<current dir>/src".'
307+
)
308+
299309
use_wheel = OptionMaker(
300310
'--use-wheel',
301311
dest='use_wheel',

pip/commands/install.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from pip.req import InstallRequirement, RequirementSet, parse_requirements
66
from pip.log import logger
7-
from pip.locations import (src_prefix, virtualenv_no_global, distutils_scheme,
7+
from pip.locations import (virtualenv_no_global, distutils_scheme,
88
build_prefix)
99
from pip.basecommand import Command
1010
from pip.index import PackageFinder
@@ -64,15 +64,7 @@ def __init__(self, *args, **kw):
6464
)
6565

6666
cmd_opts.add_option(cmdoptions.download_cache.make())
67-
68-
cmd_opts.add_option(
69-
'--src', '--source', '--source-dir', '--source-directory',
70-
dest='src_dir',
71-
metavar='dir',
72-
default=src_prefix,
73-
help='Directory to check out editable projects into. '
74-
'The default in a virtualenv is "<venv path>/src". '
75-
'The default for global installs is "<current dir>/src".')
67+
cmd_opts.add_option(cmdoptions.src.make())
7668

7769
cmd_opts.add_option(
7870
'-U', '--upgrade',

pip/commands/wheel.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ def __init__(self, *args, **kw):
6464
cmd_opts.add_option(cmdoptions.editable.make())
6565
cmd_opts.add_option(cmdoptions.requirements.make())
6666
cmd_opts.add_option(cmdoptions.download_cache.make())
67+
cmd_opts.add_option(cmdoptions.src.make())
6768
cmd_opts.add_option(cmdoptions.no_deps.make())
6869
cmd_opts.add_option(cmdoptions.build_dir.make())
6970

@@ -159,7 +160,7 @@ def run(self, options, args):
159160
options.build_dir = os.path.abspath(options.build_dir)
160161
requirement_set = RequirementSet(
161162
build_dir=options.build_dir,
162-
src_dir=None,
163+
src_dir=options.src_dir,
163164
download_dir=None,
164165
download_cache=options.download_cache,
165166
ignore_dependencies=options.ignore_dependencies,

0 commit comments

Comments
 (0)