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
4ea2ea18
Commit
4ea2ea18
authored
Sep 24, 2019
by
Arun Babu Neelicattu
Committed by
Steph Samson
Sep 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use canonical name when validating package from directory (#1305)
Closes: #1303
parent
bb87567e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
5 deletions
+26
-5
poetry/puzzle/provider.py
+3
-3
tests/fixtures/git/github.com/demo/non-canonical-name/demo/__init__.py
+1
-0
tests/fixtures/git/github.com/demo/non-canonical-name/setup.py
+19
-0
tests/puzzle/test_provider.py
+3
-2
No files found.
poetry/puzzle/provider.py
View file @
4ea2ea18
...
@@ -402,7 +402,9 @@ class Provider:
...
@@ -402,7 +402,9 @@ class Provider:
finally
:
finally
:
os
.
chdir
(
current_dir
)
os
.
chdir
(
current_dir
)
if
name
and
name
!=
package_name
:
package
=
Package
(
package_name
,
package_version
)
if
name
and
name
!=
package
.
name
:
# For now, the dependency's name must match the actual package's name
# For now, the dependency's name must match the actual package's name
raise
RuntimeError
(
raise
RuntimeError
(
"The dependency name for {} does not match the actual package's name: {}"
.
format
(
"The dependency name for {} does not match the actual package's name: {}"
.
format
(
...
@@ -410,8 +412,6 @@ class Provider:
...
@@ -410,8 +412,6 @@ class Provider:
)
)
)
)
package
=
Package
(
package_name
,
package_version
)
package
.
description
=
package_summary
package
.
description
=
package_summary
for
req
in
reqs
:
for
req
in
reqs
:
...
...
tests/fixtures/git/github.com/demo/non-canonical-name/demo/__init__.py
0 → 100644
View file @
4ea2ea18
__version__
=
"1.2.3"
tests/fixtures/git/github.com/demo/non-canonical-name/setup.py
0 → 100644
View file @
4ea2ea18
# -*- coding: utf-8 -*-
from
setuptools
import
setup
kwargs
=
dict
(
name
=
"Demo"
,
license
=
"MIT"
,
version
=
"0.1.2"
,
description
=
"Demo project."
,
author
=
"Sébastien Eustace"
,
author_email
=
"sebastien@eustace.io"
,
url
=
"https://github.com/demo/demo"
,
packages
=
[
"demo"
],
install_requires
=
[
"pendulum>=1.4.4"
],
extras_require
=
{
"foo"
:
[
"cleo"
],
"bar"
:
[
"tomlkit"
]},
)
setup
(
**
kwargs
)
tests/puzzle/test_provider.py
View file @
4ea2ea18
...
@@ -126,7 +126,8 @@ def test_search_for_vcs_read_setup_raises_error_if_no_version(provider, mocker):
...
@@ -126,7 +126,8 @@ def test_search_for_vcs_read_setup_raises_error_if_no_version(provider, mocker):
provider
.
search_for_vcs
(
dependency
)
provider
.
search_for_vcs
(
dependency
)
def
test_search_for_directory_setup_egg_info
(
provider
):
@pytest.mark.parametrize
(
"directory"
,
[
"demo"
,
"non-canonical-name"
])
def
test_search_for_directory_setup_egg_info
(
provider
,
directory
):
dependency
=
DirectoryDependency
(
dependency
=
DirectoryDependency
(
"demo"
,
"demo"
,
Path
(
__file__
)
.
parent
.
parent
Path
(
__file__
)
.
parent
.
parent
...
@@ -134,7 +135,7 @@ def test_search_for_directory_setup_egg_info(provider):
...
@@ -134,7 +135,7 @@ def test_search_for_directory_setup_egg_info(provider):
/
"git"
/
"git"
/
"github.com"
/
"github.com"
/
"demo"
/
"demo"
/
"demo"
,
/
directory
,
)
)
package
=
provider
.
search_for_directory
(
dependency
)[
0
]
package
=
provider
.
search_for_directory
(
dependency
)[
0
]
...
...
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