Skip to content

Commit 0418424

Browse files
radoeringneersighted
authored andcommitted
locker: less verbose output for package.files in lockfile 2.0
1 parent 4578c6f commit 0418424

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

src/poetry/packages/locker.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323
from tomlkit import comment
2424
from tomlkit import document
2525
from tomlkit import inline_table
26-
from tomlkit import item
2726
from tomlkit import table
2827
from tomlkit.exceptions import TOMLKitError
29-
from tomlkit.items import Array
3028

3129

3230
if TYPE_CHECKING:
@@ -228,24 +226,19 @@ def locked_repository(self) -> LockfileRepository:
228226
return repository
229227

230228
def set_lock_data(self, root: Package, packages: list[Package]) -> bool:
231-
files: dict[str, Any] = table()
232229
package_specs = self._lock_packages(packages)
233230
# Retrieving hashes
234231
for package in package_specs:
235-
if package["name"] not in files:
236-
files[package["name"]] = []
232+
files = array()
237233

238234
for f in package["files"]:
239235
file_metadata = inline_table()
240236
for k, v in sorted(f.items()):
241237
file_metadata[k] = v
242238

243-
files[package["name"]].append(file_metadata)
239+
files.append(file_metadata)
244240

245-
if files[package["name"]]:
246-
package_files = item(files[package["name"]])
247-
assert isinstance(package_files, Array)
248-
files[package["name"]] = package_files.multiline(True)
241+
package["files"] = files.multiline(True)
249242

250243
lock = document()
251244
lock.add(comment(GENERATED_COMMENT))

tests/packages/test_locker.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,10 @@ def test_lock_file_data_is_ordered(locker: Locker, root: ProjectPackage):
104104
category = "main"
105105
optional = false
106106
python-versions = "*"
107-
108-
[[package.files]]
109-
file = "bar"
110-
hash = "123"
111-
112-
[[package.files]]
113-
file = "foo"
114-
hash = "456"
107+
files = [
108+
{{file = "bar", hash = "123"}},
109+
{{file = "foo", hash = "456"}},
110+
]
115111
116112
[package.dependencies]
117113
B = "^1.0"
@@ -123,10 +119,9 @@ def test_lock_file_data_is_ordered(locker: Locker, root: ProjectPackage):
123119
category = "main"
124120
optional = false
125121
python-versions = "*"
126-
127-
[[package.files]]
128-
file = "baz"
129-
hash = "345"
122+
files = [
123+
{{file = "baz", hash = "345"}},
124+
]
130125
131126
[[package]]
132127
name = "B"

0 commit comments

Comments
 (0)