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

Store dependencies of each package in poetry.lock

parent 0b546d20
Loading
Loading
Loading
Loading
+4 −0
Changes for CHANGELOG.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@

## [Unreleased]

## Changed

- Dependencies of each package is now stored in `poetry.lock`.

### Fixed

- Fixed the `add` command for packages with dots in their names.
+14 −0
Changes for poetry/console/commands/show.py: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
from .command import Command


class ShowCommand(Command):
    """
    Shows information about packages.

    show
        { package? : Package to inspect. }
        { version? : Version to inspect. }
    """

    help = """The show command displays detailed information about a package, or
lists all packages available."""
+4 −3
Changes for poetry/packages/dependency.py: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ class Dependency:

    def __init__(self, name, constraint, optional=False, category='main'):
        self._name = name.lower()
        self._pretty_name = name
        try:
            self._constraint = VersionParser().parse_constraints(constraint)
        except ValueError:
@@ -28,7 +29,7 @@ class Dependency:

    @property
    def pretty_name(self):
        return '{} ({})'.format(self._name, self.pretty_constraint)
        return self._pretty_name

    @property
    def category(self):
@@ -53,7 +54,7 @@ class Dependency:
        return hash((self._name, self._pretty_constraint))

    def __str__(self):
        return self.pretty_name
        return f'{self._pretty_name} ({self._pretty_constraint})'

    def __repr__(self):
        return '<Dependency {}>'.format(self.pretty_name)
        return f'<Dependency {str(self)}>'
+11 −0
Changes for poetry/packages/locker.py: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ class Locker:
            package.hashes = lock_data['metadata']['hashes'][info['name']]
            package.python_versions = info['python-versions']

            for dep_name, constraint in info.get('dependencies', {}).items():
                package.add_dependency(dep_name, constraint)

            if 'source' in info:
                package.source_type = info['source']['type']
                package.source_url = info['source']['url']
@@ -173,6 +176,13 @@ class Locker:
        return locked

    def _dump_package(self, package: 'poetry.packages.Package') -> dict:
        dependencies = {}
        for dependency in package.requires:
            if dependency.is_optional():
                continue

            dependencies[dependency.pretty_name] = dependency.pretty_constraint

        data = {
            'name': package.pretty_name,
            'version': package.pretty_version,
@@ -181,6 +191,7 @@ class Locker:
            'python-versions': package.python_versions,
            'platform': package.platform,
            'hashes': package.hashes,
            'dependencies': dependencies
        }

        if package.source_type:
+48 −0
Changes for tests/installation/fixtures/with-sub-dependencies.test: 48 added lines, 0 removed lines.
Original line number Diff line number Diff line
[[package]]
name = "A"
version = "1.0"
category = "main"
optional = false
python-versions = "*"
platform = "*"

[package.dependencies]
D = "^1.0"

[[package]]
name = "B"
version = "1.1"
category = "main"
optional = false
python-versions = "*"
platform = "*"

[package.dependencies]
C = "~1.2"

[[package]]
name = "C"
version = "1.2"
category = "main"
optional = false
python-versions = "*"
platform = "*"

[[package]]
name = "D"
version = "1.3"
category = "main"
optional = false
python-versions = "*"
platform = "*"

[metadata]
python-versions = "*"
platform = "*"
content-hash = "123456789"

[metadata.hashes]
A = []
B = []
C = []
D = []
Loading