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
16c26106
Commit
16c26106
authored
Feb 28, 2022
by
Branch Vincent
Committed by
Bjorn Neergaard
Mar 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore(packages): remove type errors
parent
d158d1bb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
pyproject.toml
+0
-2
src/poetry/packages/locker.py
+7
-6
No files found.
pyproject.toml
View file @
16c26106
...
@@ -111,7 +111,6 @@ files = "src"
...
@@ -111,7 +111,6 @@ files = "src"
[[tool.mypy.overrides]]
[[tool.mypy.overrides]]
module
=
[
module
=
[
'poetry.config.file_config_source'
,
'poetry.console.application'
,
'poetry.console.application'
,
'poetry.console.logging.formatters.builder_formatter'
,
'poetry.console.logging.formatters.builder_formatter'
,
'poetry.console.commands.init'
,
'poetry.console.commands.init'
,
...
@@ -129,7 +128,6 @@ module = [
...
@@ -129,7 +128,6 @@ module = [
'poetry.mixology.solutions.solutions.python_requirement_solution'
,
'poetry.mixology.solutions.solutions.python_requirement_solution'
,
'poetry.mixology.term'
,
'poetry.mixology.term'
,
'poetry.mixology.version_solver'
,
'poetry.mixology.version_solver'
,
'poetry.packages.locker'
,
'poetry.repositories.installed_repository'
,
'poetry.repositories.installed_repository'
,
'poetry.utils.appdirs'
,
'poetry.utils.appdirs'
,
'poetry.utils.authenticator'
,
'poetry.utils.authenticator'
,
...
...
src/poetry/packages/locker.py
View file @
16c26106
...
@@ -32,6 +32,7 @@ from poetry.utils.extras import get_extra_package_names
...
@@ -32,6 +32,7 @@ from poetry.utils.extras import get_extra_package_names
if
TYPE_CHECKING
:
if
TYPE_CHECKING
:
from
tomlkit.items
import
InlineTable
from
tomlkit.toml_document
import
TOMLDocument
from
tomlkit.toml_document
import
TOMLDocument
from
poetry.repositories
import
Repository
from
poetry.repositories
import
Repository
...
@@ -147,6 +148,8 @@ class Locker:
...
@@ -147,6 +148,8 @@ class Locker:
except
InvalidRequirement
:
except
InvalidRequirement
:
# handle lock files with invalid PEP 508
# handle lock files with invalid PEP 508
m
=
re
.
match
(
r"^(.+?)(?:\[(.+?)])?(?:\s+\((.+)\))?$"
,
dep
)
m
=
re
.
match
(
r"^(.+?)(?:\[(.+?)])?(?:\s+\((.+)\))?$"
,
dep
)
if
not
m
:
raise
dep_name
=
m
.
group
(
1
)
dep_name
=
m
.
group
(
1
)
extras
=
m
.
group
(
2
)
or
""
extras
=
m
.
group
(
2
)
or
""
constraint
=
m
.
group
(
3
)
or
"*"
constraint
=
m
.
group
(
3
)
or
"*"
...
@@ -289,7 +292,7 @@ class Locker:
...
@@ -289,7 +292,7 @@ class Locker:
)
->
Iterable
[
Dependency
]:
)
->
Iterable
[
Dependency
]:
# group packages entries by name, this is required because requirement might use
# group packages entries by name, this is required because requirement might use
# different constraints
# different constraints
packages_by_name
=
{}
packages_by_name
:
dict
[
str
,
list
[
Package
]]
=
{}
for
pkg
in
locked_packages
:
for
pkg
in
locked_packages
:
if
pkg
.
name
not
in
packages_by_name
:
if
pkg
.
name
not
in
packages_by_name
:
packages_by_name
[
pkg
.
name
]
=
[]
packages_by_name
[
pkg
.
name
]
=
[]
...
@@ -349,11 +352,9 @@ class Locker:
...
@@ -349,11 +352,9 @@ class Locker:
repository
=
self
.
locked_repository
(
with_dev_reqs
=
dev
)
repository
=
self
.
locked_repository
(
with_dev_reqs
=
dev
)
# Build a set of all packages required by our selected extras
# Build a set of all packages required by our selected extras
extra_package_names
=
(
extra_package_names
:
set
[
str
]
|
None
=
None
None
if
(
isinstance
(
extras
,
bool
)
and
extras
is
True
)
else
()
)
if
extra
_package_names
is
not
Non
e
:
if
extra
s
is
not
Tru
e
:
extra_package_names
=
set
(
extra_package_names
=
set
(
get_extra_package_names
(
get_extra_package_names
(
repository
.
packages
,
repository
.
packages
,
...
@@ -505,7 +506,7 @@ class Locker:
...
@@ -505,7 +506,7 @@ class Locker:
return
locked
return
locked
def
_dump_package
(
self
,
package
:
Package
)
->
dict
:
def
_dump_package
(
self
,
package
:
Package
)
->
dict
:
dependencies
=
{}
dependencies
:
dict
[
str
,
list
[
InlineTable
]]
=
{}
for
dependency
in
sorted
(
package
.
requires
,
key
=
lambda
d
:
d
.
name
):
for
dependency
in
sorted
(
package
.
requires
,
key
=
lambda
d
:
d
.
name
):
if
dependency
.
pretty_name
not
in
dependencies
:
if
dependency
.
pretty_name
not
in
dependencies
:
dependencies
[
dependency
.
pretty_name
]
=
[]
dependencies
[
dependency
.
pretty_name
]
=
[]
...
...
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