Unverified Commit f75b1cb7 authored by Sébastien Eustace's avatar Sébastien Eustace
Browse files

Fix dependency resolution

parent 7e4668ea
Loading
Loading
Loading
Loading
+1 −1
Changes for poetry/mixology/contracts/specification_provider.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class SpecificationProvider:

    def dependencies_for(self, specification: Any) -> List[Any]:
        """
        Returns the dependencies of `specification`.
        Returns the dependencies of specification.
        """
        return []

+1 −1
Changes for poetry/mixology/contracts/ui.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class UI:
    def after_resolution(self) -> None:
        self.output.write('')

    def debug(self, depth, message) -> None:
    def debug(self, message, depth) -> None:
        if self.is_debugging():
            debug_info = str(message)
            debug_info = '\n'.join([
+1 −1
Changes for poetry/mixology/exceptions.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class VersionConflict(ResolverError):
        for conflicting in flat_map(
            list(conflicts.values()), lambda x: x.requirements
        ):
            for source, conflict_requirements in conflicting:
            for source, conflict_requirements in conflicting.items():
                for c in conflict_requirements:
                    pairs.append((c, source))

+3 −0
Changes for poetry/mixology/graph/add_edge_no_circular.py: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -50,7 +50,10 @@ class AddEdgeNoCircular(Action):
        """
        :type elements: list
        """
        try:
            index = elements.index(element)
        except ValueError:
            return

        if index != -1:
            elements.pop(index)
+4 −2
Changes for poetry/mixology/graph/add_vertex.py: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
from .action import Action
from .vertex import Vertex

_NULL = object()


class AddVertex(Action):

@@ -20,7 +22,7 @@ class AddVertex(Action):
        self._name = name
        self._payload = payload
        self._root = root
        self._existing_payload = None
        self._existing_payload = _NULL
        self._existing_root = None

    @property
@@ -56,7 +58,7 @@ class AddVertex(Action):
        return vertex

    def down(self, graph):
        if self._existing_payload is not None:
        if self._existing_payload is not _NULL:
            vertex = graph.vertices[self._name]
            vertex.payload = self._existing_payload
            vertex.root = self._existing_root
Loading