Fix support for non-single extra dependency installation

This commit is contained in:
Ethan Paul 2020-10-24 11:07:16 -04:00
parent 653622fd35
commit e8d3f4fcac
No known key found for this signature in database
GPG Key ID: D0E2CBF1245E92BF

View File

@ -233,7 +233,7 @@ def _install_env_dependencies(
raise err raise err
reporter.verbosity1( reporter.verbosity1(
f"{_REPORTER_PREFIX} identified {len(dependencies)} total dependencies from {len(venv.envconfig.deps)} env dependencies" f"{_REPORTER_PREFIX} identified {len(dependencies)} total dependencies from {len(env_deps.locked_deps)} locked env dependencies"
) )
reporter.verbosity1( reporter.verbosity1(
@ -262,13 +262,16 @@ def _install_project_dependencies(
f"{_REPORTER_PREFIX} performing installation of project dependencies" f"{_REPORTER_PREFIX} performing installation of project dependencies"
) )
base_dependencies = [ base_dependencies: List[PoetryPackage] = [
packages[item.name] for item in poetry.package.requires if not item.is_optional packages[item.name]
for item in poetry.package.requires
if not item.is_optional()
] ]
extra_dependencies: List[PoetryPackage] = []
for extra in venv.envconfig.extras: for extra in venv.envconfig.extras:
try: try:
extra_dependencies = [ extra_dependencies += [
packages[item.name] for item in poetry.package.extras[extra] packages[item.name] for item in poetry.package.extras[extra]
] ]
except KeyError: except KeyError: