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
95373099
Commit
95373099
authored
Dec 20, 2019
by
Sigurd Spieckermann
Committed by
Sébastien Eustace
Dec 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lock VCS dev-dependencies as category "dev" (#1725)
parent
affe32d8
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
2 deletions
+47
-2
poetry/packages/package.py
+1
-0
poetry/packages/vcs_dependency.py
+10
-2
tests/packages/test_package.py
+23
-0
tests/packages/test_vcs_dependency.py
+13
-0
No files found.
poetry/packages/package.py
View file @
95373099
...
@@ -297,6 +297,7 @@ class Package(object):
...
@@ -297,6 +297,7 @@ class Package(object):
branch
=
constraint
.
get
(
"branch"
,
None
),
branch
=
constraint
.
get
(
"branch"
,
None
),
tag
=
constraint
.
get
(
"tag"
,
None
),
tag
=
constraint
.
get
(
"tag"
,
None
),
rev
=
constraint
.
get
(
"rev"
,
None
),
rev
=
constraint
.
get
(
"rev"
,
None
),
category
=
category
,
optional
=
optional
,
optional
=
optional
,
)
)
elif
"file"
in
constraint
:
elif
"file"
in
constraint
:
...
...
poetry/packages/vcs_dependency.py
View file @
95373099
...
@@ -7,7 +7,15 @@ class VCSDependency(Dependency):
...
@@ -7,7 +7,15 @@ class VCSDependency(Dependency):
"""
"""
def
__init__
(
def
__init__
(
self
,
name
,
vcs
,
source
,
branch
=
None
,
tag
=
None
,
rev
=
None
,
optional
=
False
self
,
name
,
vcs
,
source
,
branch
=
None
,
tag
=
None
,
rev
=
None
,
category
=
"main"
,
optional
=
False
,
):
):
self
.
_vcs
=
vcs
self
.
_vcs
=
vcs
self
.
_source
=
source
self
.
_source
=
source
...
@@ -21,7 +29,7 @@ class VCSDependency(Dependency):
...
@@ -21,7 +29,7 @@ class VCSDependency(Dependency):
self
.
_rev
=
rev
self
.
_rev
=
rev
super
(
VCSDependency
,
self
)
.
__init__
(
super
(
VCSDependency
,
self
)
.
__init__
(
name
,
"*"
,
optional
=
optional
,
allows_prereleases
=
True
name
,
"*"
,
category
=
category
,
optional
=
optional
,
allows_prereleases
=
True
)
)
@property
@property
...
...
tests/packages/test_package.py
View file @
95373099
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
from
__future__
import
unicode_literals
from
__future__
import
unicode_literals
import
pytest
from
poetry.packages
import
Package
from
poetry.packages
import
Package
...
@@ -14,3 +16,24 @@ def test_package_authors():
...
@@ -14,3 +16,24 @@ def test_package_authors():
package
.
authors
.
insert
(
0
,
"John Doe"
)
package
.
authors
.
insert
(
0
,
"John Doe"
)
assert
package
.
author_name
==
"John Doe"
assert
package
.
author_name
==
"John Doe"
assert
package
.
author_email
is
None
assert
package
.
author_email
is
None
@pytest.mark.parametrize
(
"category"
,
[
"main"
,
"dev"
])
def
test_package_add_dependency_vcs_category
(
category
):
package
=
Package
(
"foo"
,
"0.1.0"
)
dependency
=
package
.
add_dependency
(
"poetry"
,
constraint
=
{
"git"
:
"https://github.com/python-poetry/poetry.git"
},
category
=
category
,
)
assert
dependency
.
category
==
category
def
test_package_add_dependency_vcs_category_default_main
():
package
=
Package
(
"foo"
,
"0.1.0"
)
dependency
=
package
.
add_dependency
(
"poetry"
,
constraint
=
{
"git"
:
"https://github.com/python-poetry/poetry.git"
}
)
assert
dependency
.
category
==
"main"
tests/packages/test_vcs_dependency.py
View file @
95373099
import
pytest
from
poetry.packages.vcs_dependency
import
VCSDependency
from
poetry.packages.vcs_dependency
import
VCSDependency
...
@@ -49,3 +51,14 @@ def test_to_pep_508_in_extras():
...
@@ -49,3 +51,14 @@ def test_to_pep_508_in_extras():
expected
=
'poetry @ git+https://github.com/python-poetry/poetry.git@b;ar; ; extra == "foo;"'
expected
=
'poetry @ git+https://github.com/python-poetry/poetry.git@b;ar; ; extra == "foo;"'
assert
expected
==
dependency
.
to_pep_508
()
assert
expected
==
dependency
.
to_pep_508
()
@pytest.mark.parametrize
(
"category"
,
[
"main"
,
"dev"
])
def
test_category
(
category
):
dependency
=
VCSDependency
(
"poetry"
,
"git"
,
"https://github.com/python-poetry/poetry.git"
,
category
=
category
,
)
assert
category
==
dependency
.
category
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