From e8d3f4fcacb111bee027dc8f390f14e097b1f78f Mon Sep 17 00:00:00 2001 From: Ethan Paul <24588726+enpaul@users.noreply.github.com> Date: Sat, 24 Oct 2020 11:07:16 -0400 Subject: [PATCH 1/2] Fix support for non-single extra dependency installation --- tox_poetry_installer.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tox_poetry_installer.py b/tox_poetry_installer.py index f13ce9c..efd7880 100644 --- a/tox_poetry_installer.py +++ b/tox_poetry_installer.py @@ -233,7 +233,7 @@ def _install_env_dependencies( raise err 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( @@ -262,13 +262,16 @@ def _install_project_dependencies( f"{_REPORTER_PREFIX} performing installation of project dependencies" ) - base_dependencies = [ - packages[item.name] for item in poetry.package.requires if not item.is_optional + base_dependencies: List[PoetryPackage] = [ + packages[item.name] + for item in poetry.package.requires + if not item.is_optional() ] + extra_dependencies: List[PoetryPackage] = [] for extra in venv.envconfig.extras: try: - extra_dependencies = [ + extra_dependencies += [ packages[item.name] for item in poetry.package.extras[extra] ] except KeyError: From db0cf6ce0c0c80fcc414a9b33f089a655730f4b5 Mon Sep 17 00:00:00 2001 From: Ethan Paul <24588726+enpaul@users.noreply.github.com> Date: Sat, 24 Oct 2020 11:08:47 -0400 Subject: [PATCH 2/2] Bump patch version --- pyproject.toml | 2 +- tox_poetry_installer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 35243c7..a04bb77 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "tox-poetry-installer" -version = "0.3.0" +version = "0.3.1" license = "MIT" authors = ["Ethan Paul <24588726+enpaul@users.noreply.github.com>"] description = "Tox plugin to install Tox environment dependencies using the Poetry backend and lockfile" diff --git a/tox_poetry_installer.py b/tox_poetry_installer.py index efd7880..78293cd 100644 --- a/tox_poetry_installer.py +++ b/tox_poetry_installer.py @@ -45,7 +45,7 @@ from tox.venv import VirtualEnv as ToxVirtualEnv __title__ = "tox-poetry-installer" __summary__ = "Tox plugin to install Tox environment dependencies using the Poetry backend and lockfile" -__version__ = "0.3.0" +__version__ = "0.3.1" __url__ = "https://github.com/enpaul/tox-poetry-installer/" __license__ = "MIT" __authors__ = ["Ethan Paul <24588726+enpaul@users.noreply.github.com>"]