From daa56e1290b259af8e2410b2f4d799ca71601a37 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sat, 24 Feb 2018 09:11:23 -0500 Subject: [PATCH] better solution Signed-off-by: Kenneth Reitz --- pipenv/core.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pipenv/core.py b/pipenv/core.py index e0fda565..e36f7ef1 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -1033,8 +1033,15 @@ def do_lock(verbose=False, system=False, clear=False, pre=False): if not hasattr(v, 'keys'): del lockfile[section][k] + # Ensure that develop inherits from default. + dev_packages = project.dev_packages.copy() + + for dev_package in project.dev_packages: + if dev_package in project.packages: + dev_packages[dev_package] = project.packages[dev_package] + # Resolve dev-package dependencies, with pip-tools. - deps = convert_deps_to_pip(project.dev_packages, project, r=False, include_index=True) + deps = convert_deps_to_pip(dev_packages, project, r=False, include_index=True) results = resolve_deps( deps, sources=project.sources, @@ -1145,11 +1152,6 @@ def do_lock(verbose=False, system=False, clear=False, pre=False): except IndexError: pass - # Overwrite any develop packages with default packages. - for default_package in lockfile['default']: - if default_package in lockfile['develop']: - lockfile['develop'][default_package] = lockfile['default'][default_package] - # Run the PEP 508 checker in the virtualenv, add it to the lockfile. cmd = '"{0}" {1}'.format(which('python', allow_global=system), shellquote(pep508checker.__file__.rstrip('cdo'))) c = delegator.run(cmd)