From 384ab5aca8f3e02c2f6b5d406d1e0593fe5c3fb8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 7 Aug 2022 19:49:20 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- poetry/mixology/version_solver.py | 5 +++-- poetry/packages/package_collection.py | 3 ++- poetry/puzzle/provider.py | 11 +++++++++-- poetry/repositories/base_repository.py | 9 ++++++--- poetry/repositories/repository.py | 6 ++++-- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/poetry/mixology/version_solver.py b/poetry/mixology/version_solver.py index 3acd7f6786b..728f730aa9d 100755 --- a/poetry/mixology/version_solver.py +++ b/poetry/mixology/version_solver.py @@ -12,7 +12,6 @@ from poetry.core.packages import ProjectPackage from poetry.core.semver import Version from poetry.core.semver import VersionRange - from poetry.packages.dependency_package import DependencyPackage from .failure import SolveFailure @@ -470,7 +469,9 @@ def _add_incompatibility(self, incompatibility): # type: (Incompatibility) -> N incompatibility ) - def _get_locked(self, dependency, allow_similar: bool = False): # type: (Dependency, bool) -> Union[DependencyPackage, None] + def _get_locked( + self, dependency, allow_similar: bool = False + ): # type: (Dependency, bool) -> Union[DependencyPackage, None] if dependency.name in self._use_latest: return diff --git a/poetry/packages/package_collection.py b/poetry/packages/package_collection.py index 74c833369d9..7fab8823d80 100644 --- a/poetry/packages/package_collection.py +++ b/poetry/packages/package_collection.py @@ -1,6 +1,7 @@ from typing import Union from poetry.core.packages import Package + from .dependency_package import DependencyPackage @@ -16,7 +17,7 @@ def __init__(self, dependency, packages=None): for package in packages: self.append(package) - def append(self, package): # type: (Union[Package, DependencyPackage]) -> None + def append(self, package): # type: (Union[Package, DependencyPackage]) -> None if isinstance(package, DependencyPackage): package = package.package diff --git a/poetry/puzzle/provider.py b/poetry/puzzle/provider.py index aa68e74b6b8..63ec98cf6a2 100755 --- a/poetry/puzzle/provider.py +++ b/poetry/puzzle/provider.py @@ -151,7 +151,9 @@ def search_for(self, dependency): # type: (Dependency) -> List[DependencyPackag return PackageCollection(dependency, packages) - def _get_from_deferred_cache(self, dependency): # type (Dependency) -> Optional[Package] + def _get_from_deferred_cache( + self, dependency + ): # type (Dependency) -> Optional[Package] if dependency not in self._deferred_cache: return None @@ -175,7 +177,12 @@ def search_for_vcs(self, dependency): # type: (VCSDependency) -> List[Package] """ cached = self._get_from_deferred_cache(dependency) if cached is not None: - print("!!!! get from deferred_cache", dependency, "::", self._deferred_cache[dependency]) + print( + "!!!! get from deferred_cache", + dependency, + "::", + self._deferred_cache[dependency], + ) return [cached] package = self.get_package_from_vcs( diff --git a/poetry/repositories/base_repository.py b/poetry/repositories/base_repository.py index aaf87a5d387..260c725da6c 100644 --- a/poetry/repositories/base_repository.py +++ b/poetry/repositories/base_repository.py @@ -3,18 +3,21 @@ from poetry.core.packages.package import Package + class BaseRepository(object): def __init__(self): - self._packages = [] # type: List[Package] + self._packages = [] # type: List[Package] @property - def packages(self): # type: () -> List[Package] + def packages(self): # type: () -> List[Package] return self._packages def has_package(self, package): raise NotImplementedError() - def package(self, name, version, extras=None): # type: (str, str, Optional[List[str]]) -> Package + def package( + self, name, version, extras=None + ): # type: (str, str, Optional[List[str]]) -> Package raise NotImplementedError() def find_packages(self, dependency): diff --git a/poetry/repositories/repository.py b/poetry/repositories/repository.py index c781c85ac16..711d6cf87a3 100755 --- a/poetry/repositories/repository.py +++ b/poetry/repositories/repository.py @@ -1,10 +1,10 @@ from typing import List from typing import Optional +from poetry.core.packages.package import Package from poetry.core.semver import VersionConstraint from poetry.core.semver import VersionRange from poetry.core.semver import parse_constraint -from poetry.core.packages.package import Package from .base_repository import BaseRepository @@ -25,7 +25,9 @@ def __init__(self, packages=None, name=None): def name(self): return self._name - def package(self, name, version, extras=None): # type: (str, str, Optional[List[str]]) -> Package + def package( + self, name, version, extras=None + ): # type: (str, str, Optional[List[str]]) -> Package name = name.lower() for package in self.packages: