Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Make install editable option an option #2299

Closed
wants to merge 13 commits into from
Closed

WIP: Make install editable option an option #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
15d5fa1
Make install editable option an option
mlouielu Jun 3, 2018
cbf398f
Fix editable
mlouielu Jun 28, 2018
5a43199
Merge branch 'master' into make-install-editable-option
mlouielu Jun 28, 2018
1997e58
Fix test error string and add --editable test
mlouielu Jun 28, 2018
5a13e3e
Fix typo
mlouielu Jun 28, 2018
ab47386
Merge branch 'master' into make-install-editable-option
mlouielu Jun 29, 2018
5a9c3b0
Merge branch 'master' of https://github.com/pypa/pipenv into make-ins…
mlouielu Jul 4, 2018
d0c2369
Fix the single quote in cli option
mlouielu Jul 4, 2018
adebd4b
Add multiple to editable option
mlouielu Jul 4, 2018
15f3a95
Add multiple editable test case
mlouielu Jul 4, 2018
b363ade
Merge branch 'make-install-editable-option' of github.com:mlouielu/pi…
mlouielu Jul 4, 2018
5d759a1
Consist to use double quote
mlouielu Jul 4, 2018
860a3ad
Merge branch 'master' of https://github.com/pypa/pipenv into make-ins…
mlouielu Jul 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pipenv/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,15 @@ def cli(
default=False,
help="Install package(s) in [dev-packages].",
)
@option(
"--editable",
"-e",
nargs=1,
default=False,
multiple=True,
help="Install a project in editable mode (i.e. setuptools "
"\"develop mode\") from a local project path.",
)
@option(
"--three/--two",
is_flag=True,
Expand Down Expand Up @@ -378,6 +387,7 @@ def install(
package_name=False,
more_packages=False,
dev=False,
editable=False,
three=False,
python=False,
pypi_mirror=None,
Expand All @@ -400,6 +410,7 @@ def install(
package_name=package_name,
more_packages=more_packages,
dev=dev,
editable=editable,
three=three,
python=python,
pypi_mirror=pypi_mirror,
Expand Down
15 changes: 9 additions & 6 deletions pipenv/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,7 @@ def do_install(
package_name=False,
more_packages=False,
dev=False,
editable=False,
three=False,
python=False,
pypi_mirror=None,
Expand Down Expand Up @@ -1832,12 +1833,14 @@ def do_install(
for req in import_from_code(code):
click.echo(" Found {0}!".format(crayons.green(req)))
project.add_package_to_pipfile(req)
# Capture -e argument and assign it to following package_name.
more_packages = list(more_packages)
if package_name == "-e":
if not more_packages:
raise click.BadArgumentUsage("Please provide path to editable package")
package_name = " ".join([package_name, more_packages.pop(0)])
# Assign editable (-e) to following package_name.
if editable:
editable = list(editable)
package_name = " ".join(["-e", editable.pop(0)])
more_packages = ["-e %s" % (p) for p in editable]
if isinstance(more_packages, tuple):
more_packages = list(more_packages)

# capture indexes and extra indexes
line = [package_name] + more_packages
line = " ".join(str(s) for s in line).strip()
Expand Down
7 changes: 6 additions & 1 deletion tests/integration/test_install_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,12 @@ def test_editable_no_args(PipenvInstance):
with PipenvInstance() as p:
c = p.pipenv("install -e")
assert c.return_code != 0
assert "Please provide path to editable package" in c.err
assert 'Error: -e option requires an argument' in c.err

with PipenvInstance() as p:
c = p.pipenv('install --editable')
assert c.return_code != 0
assert 'Error: --editable option requires an argument' in c.err


@pytest.mark.install
Expand Down
20 changes: 20 additions & 0 deletions tests/integration/test_install_uri.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,26 @@ def test_install_editable_git_tag(PipenvInstance, pip_src_dir, pypi):
assert "ref" in p.lockfile["default"]["six"]


@pytest.mark.install
@pytest.mark.vcs
@pytest.mark.tablib
@pytest.mark.needs_internet
@flaky
def test_install_multiple_editable(PipenvInstance, pip_src_dir, pypi):
with PipenvInstance(pypi=pypi) as p:
c = p.pipenv('install -e git+https://github.com/requests/requests.git#egg=requests '
'-e git+https://github.com/benjaminp/six.git@1.11.0#egg=six')
assert c.return_code == 0
assert 'requests' in p.pipfile['packages']
assert 'six' in p.pipfile['packages']
assert 'git' in p.pipfile['packages']['requests']
assert 'git' in p.pipfile['packages']['six']
assert 'editable' in p.pipfile['packages']['requests']
assert 'editable' in p.lockfile['default']['requests']
assert 'editable' in p.pipfile['packages']['six']
assert 'editable' in p.lockfile['default']['six']


@pytest.mark.install
@pytest.mark.index
@pytest.mark.needs_internet
Expand Down