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

Fix extra installation

parent 4891cd25
Loading
Loading
Loading
Loading
+4 −4
Changes for README.md: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ the `--no-dev` option.
poetry install --no-dev
```

You can also specify the extra features you want installed
You can also specify the extras you want installed
by passing the `--E|--extras` option (See [Extras](#extras) for more info)

```bash
@@ -259,7 +259,7 @@ poetry install -E mysql -E pgsql
#### Options

* `--no-dev`: Do not install dev dependencies.
* `-f|--features`: Features to install (multiple values allowed).
* `-E|--extras`: Features to install (multiple values allowed).

### update

@@ -635,7 +635,7 @@ name = "awesome"
mandatory = "^1.0"

# A list of all of the optional dependencies, some of which are included in the
# above `features`. They can be opted into by apps.
# below `extras`. They can be opted into by apps.
psycopg2 = { version = "^2.7", optional = true }
mysqlclient = { version = "^1.3", optional = true }

@@ -644,7 +644,7 @@ mysql = ["mysqlclient"]
pgsql = ["psycopg2"]
```

When installing packages, you can specify features by using the `-E|--extras` option:
When installing packages, you can specify extras by using the `-E|--extras` option:

```bash
poet install --extras "mysql pgsql"
+46 −16
Changes for poetry/installation/installer.py: 46 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ class Installer:
        # We need to filter operations so that packages
        # not compatible with the current system,
        # or optional and not requested, are dropped
        self._filter_operations(ops)
        self._filter_operations(ops, local_repo)

        self._io.new_line()

@@ -336,12 +336,11 @@ class Installer:
                                  ) -> List[Operation]:
        installed_repo = InstalledRepository.load(self._io.venv)
        ops = []
        extras = []
        for extra_name, packages in self._locker.lock_data.get('extras').items():
            if extra_name in self._extras:
                for package in packages:
                    extras.append(package.lower())

        extra_packages = [
            p.name
            for p in self._get_extra_packages(locked_repository)
        ]
        for locked in locked_repository.packages:
            is_installed = False
            for installed in installed_repo.packages:
@@ -349,7 +348,7 @@ class Installer:
                    is_installed = True
                    if locked.category == 'dev' and not self.is_dev_mode():
                        ops.append(Uninstall(locked))
                    elif locked.is_optional() and locked.name not in extras:
                    elif locked.optional and locked.name not in extra_packages:
                        # Installed but optional and not requested in extras
                        ops.append(Uninstall(locked))
                    elif locked.version != installed.version:
@@ -360,14 +359,16 @@ class Installer:
            if not is_installed:
                # If it's optional and not in required extras
                # we do not install
                if locked.is_optional() and locked.name not in extras:
                if locked.optional and locked.name not in extra_packages:
                    continue

                ops.append(Install(locked))

        return ops

    def _filter_operations(self, ops: List[Operation]):
    def _filter_operations(self, ops: List[Operation], repo: Repository) -> None:
        extra_packages = [p.name for p in
                          self._get_extra_packages(repo)]
        for op in ops:
            if isinstance(op, Update):
                package = op.target_package
@@ -394,20 +395,49 @@ class Installer:
                    extras[extra] = [dep.name for dep in deps]
            else:
                extras = {}
                for extra, deps in self._locker.lock_data.get('extras', {}):
                for extra, deps in self._locker.lock_data.get('extras', {}).items():
                    extras[extra] = [dep.lower() for dep in deps]

            # If a package is optional and not requested
            # in any extra we skip it
            if package.optional:
                drop = True
                for extra in self._extras:
                    if extra in extras and package.name in extras[extra]:
                        drop = False
                if package.name not in extra_packages:
                    op.skip('Not required')

    def _get_extra_packages(self, repo):
        """
        Returns all packages required by extras.

        Maybe we just let the solver handle it?
        """
        if self._update:
            extras = {
                k: [d.name for d in v]
                for k, v in self._package.extras.items()
            }
        else:
            extras = self._locker.lock_data.get('extras', {})

        extra_packages = []
        for extra_name, packages in extras.items():
            if extra_name not in self._extras:
                continue

                if drop:
                    op.skip('Not required')
            extra_packages += [Dependency(p, '*') for p in packages]

        def _extra_packages(packages):
            pkgs = []
            for package in packages:
                for pkg in repo.packages:
                    if pkg.name == package.name:
                        pkgs.append(package)
                        pkgs += _extra_packages(pkg.requires)

                        break

            return pkgs

        return _extra_packages(extra_packages)

    def _get_installer(self) -> BaseInstaller:
        return PipInstaller(self._io.venv, self._io)
+7 −0
Changes for poetry/poetry.py: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
from pathlib import Path

from .__version__ import __version__
from .packages import Dependency
from .packages import Locker
from .packages import Package
from .repositories import Pool
@@ -102,6 +103,12 @@ class Poetry:
            for name, constraint in local_config['dev-dependencies'].items():
                package.add_dependency(name, constraint, category='dev')

        if 'extras' in local_config:
            for extra_name, requirements in local_config['extras'].items():
                package.extras[extra_name] = [
                    Dependency(req, '*') for req in requirements
                ]

        locker = Locker(poetry_file.with_suffix('.lock'), local_config)

        return cls(poetry_file, local_config, package, locker)
+2 −2
Changes for poetry/puzzle/solver.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class Solver:
        self._locked = locked
        self._io = io

    def solve(self, requested, fixed=None) -> List[Operation]:
    def solve(self, requested, fixed=None, extras=None) -> List[Operation]:
        resolver = Resolver(Provider(self._package, self._pool), UI(self._io))

        base = None
@@ -40,7 +40,7 @@ class Solver:

        packages = [v.payload for v in graph.vertices.values()]

        # Setting categories
        # Setting info
        for vertex in graph.vertices.values():
            tags = self._get_tags_for_vertex(vertex, requested)
            if 'main' in tags['category']:
+6 −0
Changes for tests/fixtures/sample_project/pyproject.toml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ pendulum = { git = "https://github.com/sdispater/pendulum.git", branch = "2.0" }
requests = { version = "^2.18", optional = true, extras=[ "security" ] }
pathlib2 = { version = "^2.2", python = "~2.7" }

orator = { version = "^0.9", optional = true}


[tool.poetry.extras]
db = [ "orator" ]

[tool.poetry.dev-dependencies]
pytest = "~3.4"

Loading