Loading CHANGELOG.md +7 −3 Changes for CHANGELOG.md: 7 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -4,15 +4,19 @@ ### Added - Add packaging support (sdist and pure-python wheel). - Add the `build` command. - Added packaging support (sdist and pure-python wheel). - Added the `build` command. ### Changes - Dependencies system constraints are now respected when installing packages. ## [0.3.0] - 2018-03-05 ### Added - Add `show` command. - Added `show` command. - Added the `--dry-run` option to the `add` command. ### Changed Loading poetry/installation/installer.py +50 −0 Changes for poetry/installation/installer.py: 50 added lines, 0 removed lines. Original line number Diff line number Diff line import sys from typing import List from poetry.packages import Dependency Loading @@ -11,6 +13,8 @@ from poetry.puzzle.operations.operation import Operation from poetry.repositories import Pool from poetry.repositories import Repository from poetry.repositories.installed_repository import InstalledRepository from poetry.semver.constraints import Constraint from poetry.semver.version_parser import VersionParser from .base_installer import BaseInstaller from .pip_installer import PipInstaller Loading Loading @@ -39,6 +43,10 @@ class Installer: self._installer = self._get_installer() @property def installer(self): return self._installer def run(self): # Force update if there is no lock file present if not self._update and not self._locker.is_locked(): Loading Loading @@ -156,6 +164,10 @@ class Installer: self._populate_local_repo(local_repo, ops, locked_repository) # We need to filter operations so that packages # not compatible with the current system are dropped self._filter_operations(ops) self._io.new_line() # Execute operations Loading Loading @@ -215,6 +227,15 @@ class Installer: getattr(self, f'_execute_{method}')(operation) def _execute_install(self, operation: Install) -> None: if operation.skipped: if self._io.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.writeln( f' - Skipping <info>{operation.package.name}</> ' f'(<comment>{operation.package.full_pretty_version}</>) ' f'{operation.skip_reason}') return if self._execute_operations or self.is_dry_run(): self._io.writeln( f' - Installing <info>{operation.package.name}</> ' Loading @@ -230,6 +251,15 @@ class Installer: source = operation.initial_package target = operation.target_package if operation.skipped: if self._io.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.writeln( f' - Skipping <info>{target.name}</> ' f'(<comment>{target.full_pretty_version}</>) ' f'{operation.skip_reason}') return if self._execute_operations or self.is_dry_run(): self._io.writeln( f' - Updating <info>{target.name}</> ' Loading Loading @@ -307,5 +337,25 @@ class Installer: return ops def _filter_operations(self, ops: List[Operation]): for op in ops: if isinstance(op, Update): package = op.target_package else: package = op.package if not package.requirements or op.job_type == 'uninstall': continue parser = VersionParser() python = '.'.join([str(i) for i in sys.version_info[:3]]) if 'python' in package.requirements: python_constraint = parser.parse_constraints( package.requirements['python'] ) if not python_constraint.matches(Constraint('=', python)): # Incompatible python versions op.skip('Not needed for the current python version') def _get_installer(self) -> BaseInstaller: return PipInstaller(self._io.venv, self._io) poetry/installation/noop_installer.py +20 −3 Changes for poetry/installation/noop_installer.py: 20 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -3,11 +3,28 @@ from .base_installer import BaseInstaller class NoopInstaller(BaseInstaller): def __init__(self): self._installs = [] self._updates = [] self._removals = [] @property def installs(self): return self._installs @property def updates(self): return self._updates @property def removals(self): return self._removals def install(self, package) -> None: pass self._installs.append(package) def update(self, source, target) -> None: pass self._updates.append((source, target)) def remove(self, package) -> None: pass self._removals.append(package) poetry/packages/locker.py +3 −0 Changes for poetry/packages/locker.py: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -196,5 +196,8 @@ class Locker: 'reference': package.source_reference } if package.requirements: data['requirements'] = package.requirements return data poetry/packages/package.py +40 −4 Changes for poetry/packages/package.py: 40 added lines, 4 removed lines. Original line number Diff line number Diff line from poetry.semver.constraints.base_constraint import BaseConstraint from typing import Union from poetry.semver.helpers import parse_stability from poetry.semver.version_parser import VersionParser Loading Loading @@ -69,6 +70,9 @@ class Package: self.hashes = [] self.optional = False # Requirements for making it mandatory self.requirements = {} self._python_versions = '*' self._python_constraint = self._parser.parse_constraints('*') self._platform = '*' Loading Loading @@ -146,25 +150,57 @@ class Package: def is_prerelease(self): return self._stability != 'stable' def add_dependency(self, name, constraint=None, category='main'): def add_dependency(self, name: str, constraint: Union[str, dict, None] = None, category: str = 'main') -> Dependency: if constraint is None: constraint = '*' if isinstance(constraint, dict): if 'git' in constraint: # VCS dependency optional = constraint.get('optional', False) python_versions = constraint.get('python') platform = constraint.get('platform') optional = optional or python_versions is not None or platform is not None dependency = VCSDependency( name, 'git', constraint['git'], branch=constraint.get('branch', None), tag=constraint.get('tag', None), rev=constraint.get('rev', None), optional=constraint.get('optional', None), optional=optional, ) if python_versions: dependency.python_versions = python_versions if platform: dependency.platform = platform else: version = constraint['version'] optional = constraint.get('optional', False) dependency = Dependency(name, version, optional=optional, category=category) allows_prereleases = constraint.get('allows_prereleases', False) python_versions = constraint.get('python') platform = constraint.get('platform') optional = optional or python_versions is not None or not platform is not None dependency = Dependency( name, version, optional=optional, category=category, allows_prereleases=allows_prereleases ) if python_versions: dependency.python_versions = python_versions if platform: dependency.platform = platform else: dependency = Dependency(name, constraint, category=category) Loading Loading
CHANGELOG.md +7 −3 Changes for CHANGELOG.md: 7 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -4,15 +4,19 @@ ### Added - Add packaging support (sdist and pure-python wheel). - Add the `build` command. - Added packaging support (sdist and pure-python wheel). - Added the `build` command. ### Changes - Dependencies system constraints are now respected when installing packages. ## [0.3.0] - 2018-03-05 ### Added - Add `show` command. - Added `show` command. - Added the `--dry-run` option to the `add` command. ### Changed Loading
poetry/installation/installer.py +50 −0 Changes for poetry/installation/installer.py: 50 added lines, 0 removed lines. Original line number Diff line number Diff line import sys from typing import List from poetry.packages import Dependency Loading @@ -11,6 +13,8 @@ from poetry.puzzle.operations.operation import Operation from poetry.repositories import Pool from poetry.repositories import Repository from poetry.repositories.installed_repository import InstalledRepository from poetry.semver.constraints import Constraint from poetry.semver.version_parser import VersionParser from .base_installer import BaseInstaller from .pip_installer import PipInstaller Loading Loading @@ -39,6 +43,10 @@ class Installer: self._installer = self._get_installer() @property def installer(self): return self._installer def run(self): # Force update if there is no lock file present if not self._update and not self._locker.is_locked(): Loading Loading @@ -156,6 +164,10 @@ class Installer: self._populate_local_repo(local_repo, ops, locked_repository) # We need to filter operations so that packages # not compatible with the current system are dropped self._filter_operations(ops) self._io.new_line() # Execute operations Loading Loading @@ -215,6 +227,15 @@ class Installer: getattr(self, f'_execute_{method}')(operation) def _execute_install(self, operation: Install) -> None: if operation.skipped: if self._io.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.writeln( f' - Skipping <info>{operation.package.name}</> ' f'(<comment>{operation.package.full_pretty_version}</>) ' f'{operation.skip_reason}') return if self._execute_operations or self.is_dry_run(): self._io.writeln( f' - Installing <info>{operation.package.name}</> ' Loading @@ -230,6 +251,15 @@ class Installer: source = operation.initial_package target = operation.target_package if operation.skipped: if self._io.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.writeln( f' - Skipping <info>{target.name}</> ' f'(<comment>{target.full_pretty_version}</>) ' f'{operation.skip_reason}') return if self._execute_operations or self.is_dry_run(): self._io.writeln( f' - Updating <info>{target.name}</> ' Loading Loading @@ -307,5 +337,25 @@ class Installer: return ops def _filter_operations(self, ops: List[Operation]): for op in ops: if isinstance(op, Update): package = op.target_package else: package = op.package if not package.requirements or op.job_type == 'uninstall': continue parser = VersionParser() python = '.'.join([str(i) for i in sys.version_info[:3]]) if 'python' in package.requirements: python_constraint = parser.parse_constraints( package.requirements['python'] ) if not python_constraint.matches(Constraint('=', python)): # Incompatible python versions op.skip('Not needed for the current python version') def _get_installer(self) -> BaseInstaller: return PipInstaller(self._io.venv, self._io)
poetry/installation/noop_installer.py +20 −3 Changes for poetry/installation/noop_installer.py: 20 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -3,11 +3,28 @@ from .base_installer import BaseInstaller class NoopInstaller(BaseInstaller): def __init__(self): self._installs = [] self._updates = [] self._removals = [] @property def installs(self): return self._installs @property def updates(self): return self._updates @property def removals(self): return self._removals def install(self, package) -> None: pass self._installs.append(package) def update(self, source, target) -> None: pass self._updates.append((source, target)) def remove(self, package) -> None: pass self._removals.append(package)
poetry/packages/locker.py +3 −0 Changes for poetry/packages/locker.py: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -196,5 +196,8 @@ class Locker: 'reference': package.source_reference } if package.requirements: data['requirements'] = package.requirements return data
poetry/packages/package.py +40 −4 Changes for poetry/packages/package.py: 40 added lines, 4 removed lines. Original line number Diff line number Diff line from poetry.semver.constraints.base_constraint import BaseConstraint from typing import Union from poetry.semver.helpers import parse_stability from poetry.semver.version_parser import VersionParser Loading Loading @@ -69,6 +70,9 @@ class Package: self.hashes = [] self.optional = False # Requirements for making it mandatory self.requirements = {} self._python_versions = '*' self._python_constraint = self._parser.parse_constraints('*') self._platform = '*' Loading Loading @@ -146,25 +150,57 @@ class Package: def is_prerelease(self): return self._stability != 'stable' def add_dependency(self, name, constraint=None, category='main'): def add_dependency(self, name: str, constraint: Union[str, dict, None] = None, category: str = 'main') -> Dependency: if constraint is None: constraint = '*' if isinstance(constraint, dict): if 'git' in constraint: # VCS dependency optional = constraint.get('optional', False) python_versions = constraint.get('python') platform = constraint.get('platform') optional = optional or python_versions is not None or platform is not None dependency = VCSDependency( name, 'git', constraint['git'], branch=constraint.get('branch', None), tag=constraint.get('tag', None), rev=constraint.get('rev', None), optional=constraint.get('optional', None), optional=optional, ) if python_versions: dependency.python_versions = python_versions if platform: dependency.platform = platform else: version = constraint['version'] optional = constraint.get('optional', False) dependency = Dependency(name, version, optional=optional, category=category) allows_prereleases = constraint.get('allows_prereleases', False) python_versions = constraint.get('python') platform = constraint.get('platform') optional = optional or python_versions is not None or not platform is not None dependency = Dependency( name, version, optional=optional, category=category, allows_prereleases=allows_prereleases ) if python_versions: dependency.python_versions = python_versions if platform: dependency.platform = platform else: dependency = Dependency(name, constraint, category=category) Loading