Loading CHANGELOG.md +1 −0 Changes for CHANGELOG.md: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ - Dependencies of each package is now stored in `poetry.lock`. - Improved TOML file management. - Dependency resolver now respects the root package python version requirements. ### Fixed Loading poetry.toml +1 −1 Changes for poetry.toml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,7 +3,7 @@ name = "poetry" version = "0.2.0" description = "Python dependency management and packaging made easy." python-versions = ["^3.6"] python-versions = "^3.6" license = "MIT" Loading poetry/installation/installer.py +7 −2 Changes for poetry/installation/installer.py: 7 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -126,12 +126,17 @@ class Installer: Dependency(candidate.name, candidate.version) ) solver = Solver(locked_repository, self._io) solver = Solver( self._package, self._pool, locked_repository, self._io ) request = self._package.requires request += self._package.dev_requires ops = solver.solve(request, self._pool, fixed=fixed) ops = solver.solve(request, fixed=fixed) else: self._io.writeln('<info>Installing dependencies from lock file</>') if not self._locker.is_fresh(): Loading poetry/packages/dependency.py +58 −5 Changes for poetry/packages/dependency.py: 58 added lines, 5 removed lines. Original line number Diff line number Diff line import poetry.packages from poetry.semver.constraints import Constraint from poetry.semver.constraints.base_constraint import BaseConstraint from poetry.semver.version_parser import VersionParser class Dependency: def __init__(self, name, constraint, optional=False, category='main'): def __init__(self, name: str, constraint: str, optional: bool = False, category: str = 'main', allows_prereleases: bool = False): self._name = name.lower() self._pretty_name = name self._parser = VersionParser() try: self._constraint = VersionParser().parse_constraints(constraint) self._constraint = self._parser.parse_constraints(constraint) except ValueError: self._constraint = VersionParser().parse_constraints('*') self._constraint = self._parser.parse_constraints('*') self._pretty_constraint = constraint self._optional = optional self._category = category self._allows_prereleases = allows_prereleases self._python_versions = '*' self._python_constraint = self._parser.parse_constraints('*') self._platform = '*' self._platform_constraint = self._parser.parse_constraints('*') @property def name(self): Loading @@ -35,8 +52,34 @@ class Dependency: def category(self): return self._category def accepts_prereleases(self): return False @property def python_versions(self): return self._python_versions @python_versions.setter def python_versions(self, value: str): self._python_versions = value self._python_constraint = self._parser.parse_constraints(value) @property def python_constraint(self): return self._python_constraint @property def platform(self) -> str: return self._platform @platform.setter def platform(self, value: str): self._platform = value self._platform_constraint = self._parser.parse_constraints(value) @property def platform_constraint(self): return self._platform_constraint def allows_prereleases(self): return self._allows_prereleases def is_optional(self): return self._optional Loading @@ -44,6 +87,16 @@ class Dependency: def is_vcs(self): return False def accepts(self, package: 'poetry.packages.Package') -> bool: """ Determines if the given package matches this dependency. """ return ( self._name == package.name and self._constraint.matches(Constraint('=', package.version)) and (not package.is_prerelease() or self.allows_prereleases()) ) def __eq__(self, other): if not isinstance(other, Dependency): return NotImplemented Loading poetry/packages/locker.py +1 −1 Changes for poetry/packages/locker.py: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ class Locker: _relevant_keys = [ 'name', 'version', 'python_versions', 'python-versions', 'dependencies', 'dev-dependencies', 'source', Loading Loading
CHANGELOG.md +1 −0 Changes for CHANGELOG.md: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ - Dependencies of each package is now stored in `poetry.lock`. - Improved TOML file management. - Dependency resolver now respects the root package python version requirements. ### Fixed Loading
poetry.toml +1 −1 Changes for poetry.toml: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,7 +3,7 @@ name = "poetry" version = "0.2.0" description = "Python dependency management and packaging made easy." python-versions = ["^3.6"] python-versions = "^3.6" license = "MIT" Loading
poetry/installation/installer.py +7 −2 Changes for poetry/installation/installer.py: 7 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -126,12 +126,17 @@ class Installer: Dependency(candidate.name, candidate.version) ) solver = Solver(locked_repository, self._io) solver = Solver( self._package, self._pool, locked_repository, self._io ) request = self._package.requires request += self._package.dev_requires ops = solver.solve(request, self._pool, fixed=fixed) ops = solver.solve(request, fixed=fixed) else: self._io.writeln('<info>Installing dependencies from lock file</>') if not self._locker.is_fresh(): Loading
poetry/packages/dependency.py +58 −5 Changes for poetry/packages/dependency.py: 58 added lines, 5 removed lines. Original line number Diff line number Diff line import poetry.packages from poetry.semver.constraints import Constraint from poetry.semver.constraints.base_constraint import BaseConstraint from poetry.semver.version_parser import VersionParser class Dependency: def __init__(self, name, constraint, optional=False, category='main'): def __init__(self, name: str, constraint: str, optional: bool = False, category: str = 'main', allows_prereleases: bool = False): self._name = name.lower() self._pretty_name = name self._parser = VersionParser() try: self._constraint = VersionParser().parse_constraints(constraint) self._constraint = self._parser.parse_constraints(constraint) except ValueError: self._constraint = VersionParser().parse_constraints('*') self._constraint = self._parser.parse_constraints('*') self._pretty_constraint = constraint self._optional = optional self._category = category self._allows_prereleases = allows_prereleases self._python_versions = '*' self._python_constraint = self._parser.parse_constraints('*') self._platform = '*' self._platform_constraint = self._parser.parse_constraints('*') @property def name(self): Loading @@ -35,8 +52,34 @@ class Dependency: def category(self): return self._category def accepts_prereleases(self): return False @property def python_versions(self): return self._python_versions @python_versions.setter def python_versions(self, value: str): self._python_versions = value self._python_constraint = self._parser.parse_constraints(value) @property def python_constraint(self): return self._python_constraint @property def platform(self) -> str: return self._platform @platform.setter def platform(self, value: str): self._platform = value self._platform_constraint = self._parser.parse_constraints(value) @property def platform_constraint(self): return self._platform_constraint def allows_prereleases(self): return self._allows_prereleases def is_optional(self): return self._optional Loading @@ -44,6 +87,16 @@ class Dependency: def is_vcs(self): return False def accepts(self, package: 'poetry.packages.Package') -> bool: """ Determines if the given package matches this dependency. """ return ( self._name == package.name and self._constraint.matches(Constraint('=', package.version)) and (not package.is_prerelease() or self.allows_prereleases()) ) def __eq__(self, other): if not isinstance(other, Dependency): return NotImplemented Loading
poetry/packages/locker.py +1 −1 Changes for poetry/packages/locker.py: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ class Locker: _relevant_keys = [ 'name', 'version', 'python_versions', 'python-versions', 'dependencies', 'dev-dependencies', 'source', Loading