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
ce9ea77d
Commit
ce9ea77d
authored
Jan 05, 2020
by
finswimmer
Committed by
Sébastien Eustace
Jan 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix (vcs_dependency): create valid PEP508 string for git dependencies with ssh (#1799)
parent
8a3d2d76
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletions
+17
-1
poetry/packages/vcs_dependency.py
+8
-0
poetry/vcs/git.py
+1
-1
tests/packages/test_vcs_dependency.py
+8
-0
No files found.
poetry/packages/vcs_dependency.py
View file @
ce9ea77d
from
poetry.vcs
import
git
from
.dependency
import
Dependency
from
.dependency
import
Dependency
...
@@ -73,11 +75,17 @@ class VCSDependency(Dependency):
...
@@ -73,11 +75,17 @@ class VCSDependency(Dependency):
@property
@property
def
base_pep_508_name
(
self
):
# type: () -> str
def
base_pep_508_name
(
self
):
# type: () -> str
requirement
=
self
.
pretty_name
requirement
=
self
.
pretty_name
parsed_url
=
git
.
ParsedUrl
.
parse
(
self
.
_source
)
if
self
.
extras
:
if
self
.
extras
:
requirement
+=
"[{}]"
.
format
(
","
.
join
(
self
.
extras
))
requirement
+=
"[{}]"
.
format
(
","
.
join
(
self
.
extras
))
if
parsed_url
.
protocol
is
not
None
:
requirement
+=
" @ {}+{}@{}"
.
format
(
self
.
_vcs
,
self
.
_source
,
self
.
reference
)
requirement
+=
" @ {}+{}@{}"
.
format
(
self
.
_vcs
,
self
.
_source
,
self
.
reference
)
else
:
requirement
+=
" @ {}+ssh://{}@{}"
.
format
(
self
.
_vcs
,
parsed_url
.
format
(),
self
.
reference
)
return
requirement
return
requirement
...
...
poetry/vcs/git.py
View file @
ce9ea77d
...
@@ -86,7 +86,7 @@ class ParsedUrl:
...
@@ -86,7 +86,7 @@ class ParsedUrl:
"{}@"
.
format
(
self
.
user
)
if
self
.
user
else
""
,
"{}@"
.
format
(
self
.
user
)
if
self
.
user
else
""
,
self
.
resource
,
self
.
resource
,
":{}"
.
format
(
self
.
port
)
if
self
.
port
else
""
,
":{}"
.
format
(
self
.
port
)
if
self
.
port
else
""
,
"/"
+
self
.
pathname
if
self
.
pathname
.
startswith
(
":"
)
else
self
.
pathname
,
"/"
+
self
.
pathname
.
lstrip
(
":/"
)
,
)
)
def
format
(
self
):
def
format
(
self
):
...
...
tests/packages/test_vcs_dependency.py
View file @
ce9ea77d
...
@@ -13,6 +13,14 @@ def test_to_pep_508():
...
@@ -13,6 +13,14 @@ def test_to_pep_508():
assert
expected
==
dependency
.
to_pep_508
()
assert
expected
==
dependency
.
to_pep_508
()
def
test_to_pep_508_ssh
():
dependency
=
VCSDependency
(
"poetry"
,
"git"
,
"git@github.com:sdispater/poetry.git"
)
expected
=
"poetry @ git+ssh://git@github.com/sdispater/poetry.git@master"
assert
expected
==
dependency
.
to_pep_508
()
def
test_to_pep_508_with_extras
():
def
test_to_pep_508_with_extras
():
dependency
=
VCSDependency
(
dependency
=
VCSDependency
(
"poetry"
,
"git"
,
"https://github.com/python-poetry/poetry.git"
"poetry"
,
"git"
,
"https://github.com/python-poetry/poetry.git"
...
...
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