Commit 7d970886 by Sébastien Eustace

Fix add command with prerelease packages

parent 93288f05
...@@ -11,6 +11,7 @@ class DebugResolveCommand(Command): ...@@ -11,6 +11,7 @@ class DebugResolveCommand(Command):
debug:resolve debug:resolve
{ package?* : packages to resolve. } { package?* : packages to resolve. }
{ --E|extras=* : Extras to activate for the dependency. }
""" """
_loggers = [ _loggers = [
...@@ -38,9 +39,11 @@ class DebugResolveCommand(Command): ...@@ -38,9 +39,11 @@ class DebugResolveCommand(Command):
dependencies = [] dependencies = []
for name, constraint in requirements.items(): for name, constraint in requirements.items():
dependencies.append( dep = Dependency(name, constraint)
Dependency(name, constraint) for ex in self.option('extras'):
) dep.extras.append(ex)
dependencies.append(dep)
package = ProjectPackage( package = ProjectPackage(
self.poetry.package.name, self.poetry.package.name,
......
...@@ -123,7 +123,7 @@ class Package(object): ...@@ -123,7 +123,7 @@ class Package(object):
@property @property
def full_pretty_version(self): def full_pretty_version(self):
if not self.is_prerelease() and self.source_type not in ['hg', 'git']: if self.source_type not in ['hg', 'git']:
return self._pretty_version return self._pretty_version
# if source reference is a sha1 hash -- truncate # if source reference is a sha1 hash -- truncate
......
...@@ -24,7 +24,10 @@ class VersionSelector(object): ...@@ -24,7 +24,10 @@ class VersionSelector(object):
else: else:
constraint = None constraint = None
candidates = self._pool.find_packages(package_name, constraint) candidates = self._pool.find_packages(
package_name, constraint,
allow_prereleases=allow_prereleases
)
if not candidates: if not candidates:
return False return False
...@@ -61,7 +64,9 @@ class VersionSelector(object): ...@@ -61,7 +64,9 @@ class VersionSelector(object):
if parts[0] != 0: if parts[0] != 0:
del parts[2] del parts[2]
version = '.'.join([str(p) for p in parts]) version = '.'.join(str(p) for p in parts)
if parsed.is_prerelease():
version += '-{}'.format('.'.join(str(p) for p in parsed.prerelease))
else: else:
return pretty_version return pretty_version
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment