From 8fec71544659b29382c5436f76ab206a883cd227 Mon Sep 17 00:00:00 2001 From: finswimmer Date: Sun, 29 Mar 2020 08:57:05 +0200 Subject: [PATCH] fix (pip_installer): to many arguments for SdistBuilder fix (installed_repository): Catch CalledProcessError when trying to fetch revision --- poetry/installation/pip_installer.py | 6 +----- poetry/repositories/installed_repository.py | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/poetry/installation/pip_installer.py b/poetry/installation/pip_installer.py index b281bc14523..a72dd126576 100644 --- a/poetry/installation/pip_installer.py +++ b/poetry/installation/pip_installer.py @@ -6,7 +6,6 @@ from subprocess import CalledProcessError from clikit.api.io import IO -from clikit.io import NullIO from poetry.repositories.pool import Pool from poetry.utils._compat import Path @@ -182,7 +181,6 @@ def install_directory(self, package): from poetry.core.masonry.builder import SdistBuilder from poetry.factory import Factory from poetry.utils._compat import decode - from poetry.utils.env import NullEnv from poetry.utils.toml_file import TomlFile if package.root_dir: @@ -213,9 +211,7 @@ def install_directory(self, package): # file since pip, as of this comment, does not support # build-system for editable packages # We also need it for non-PEP-517 packages - builder = SdistBuilder( - Factory().create_poetry(pyproject.parent), NullEnv(), NullIO() - ) + builder = SdistBuilder(Factory().create_poetry(pyproject.parent)) with open(setup, "w", encoding="utf-8") as f: f.write(decode(builder.build_setup())) diff --git a/poetry/repositories/installed_repository.py b/poetry/repositories/installed_repository.py index 74a6af5cce6..c5f3bea9ab9 100644 --- a/poetry/repositories/installed_repository.py +++ b/poetry/repositories/installed_repository.py @@ -1,3 +1,5 @@ +from subprocess import CalledProcessError + from poetry.core.packages import Package from poetry.utils._compat import Path from poetry.utils._compat import metadata @@ -69,7 +71,7 @@ def load(cls, env): # type: (Env) -> InstalledRepository package.source_type = "git" package.source_url = url package.source_reference = revision - except ValueError: + except (ValueError, CalledProcessError): package.source_type = "directory" package.source_url = str(path.parent)