Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
python-poetry
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
python-poetry
Commits
7d970886
Unverified
Commit
7d970886
authored
May 18, 2018
by
Sébastien Eustace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix add command with prerelease packages
parent
93288f05
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
poetry/console/commands/debug/resolve.py
+6
-3
poetry/packages/package.py
+1
-1
poetry/version/version_selector.py
+7
-2
No files found.
poetry/console/commands/debug/resolve.py
View file @
7d970886
...
@@ -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
,
...
...
poetry/packages/package.py
View file @
7d970886
...
@@ -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
...
...
poetry/version/version_selector.py
View file @
7d970886
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment