Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add output for poetry lock --check #5081

Merged
merged 7 commits into from
Feb 9, 2022
Merged

Add output for poetry lock --check #5081

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
67a00d1
Add output for poetry lock --check
artemrys Jan 21, 2022
2cc1a3b
Rephrase messages
artemrys Jan 31, 2022
1f9f3d4
Add punctuation mark at the end of the message
artemrys Feb 2, 2022
cd9eaa5
Update wording for installer and export
artemrys Feb 2, 2022
456359a
Put warning back for installer and export
artemrys Feb 8, 2022
b1e4b57
Finalize warning messages
artemrys Feb 8, 2022
94eeecc
Improve fix messages
artemrys Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/poetry/console/commands/export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,11 @@ def handle(self) -> None:
self.call("lock", " ".join(options))

if not locker.is_fresh():
self.line_error(
self._io.write_line(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, line_error() is correct here, because warnings should go to stderr instead of stdout. I know, in installer.py the warning is written to stdout... Maybe, something that can be harmonized for all warnings in a separate PR...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

"<warning>"
"Warning: The lock file is not up to date with "
"the latest changes in pyproject.toml. "
"You may be getting outdated dependencies. "
"Run update to update them."
"Error: poetry.lock is not consistent with pyproject.toml. "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should start with "Warning: "

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

"You may be getting improper dependencies. "
"Run `poetry update` to fix it."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be poetry lock [--no-update] instead of poetry update.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same in installer.py.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

"</warning>"
)

Expand Down
13 changes: 9 additions & 4 deletions src/poetry/console/commands/lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ def handle(self) -> int:
)

if self.option("check"):
return (
0
if self.poetry.locker.is_locked() and self.poetry.locker.is_fresh()
else 1
if self.poetry.locker.is_locked() and self.poetry.locker.is_fresh():
self.line("poetry.lock is consistent with pyproject.toml.")
return 0
self.line(
"<error>"
"Error: poetry.lock is not consistent with pyproject.toml. "
"Run `poetry lock [--no-update]` to fix it."
"</error>"
)
return 1

self._installer.lock(update=not self.option("no-update"))

Expand Down
7 changes: 3 additions & 4 deletions src/poetry/installation/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,9 @@ def _do_install(self, local_repo: Repository) -> int:
if not self._locker.is_fresh():
self._io.write_line(
"<warning>"
"Warning: The lock file is not up to date with "
"the latest changes in pyproject.toml. "
"You may be getting outdated dependencies. "
"Run update to update them."
"Error: poetry.lock is not consistent with pyproject.toml. "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also start with "Warning: "

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

"You may be getting improper dependencies. "
"Run `poetry update` to fix it."
"</warning>"
)

Expand Down
8 changes: 8 additions & 0 deletions tests/console/commands/test_lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ def test_lock_check_outdated(

tester = command_tester_factory("lock", poetry=poetry_with_outdated_lockfile)
status_code = tester.execute("--check")
expected = (
"Error: poetry.lock is not consistent with pyproject.toml. "
"Run `poetry lock [--no-update]` to fix it.\n"
)

assert tester.io.fetch_output() == expected

# exit with an error
assert status_code == 1
Expand All @@ -101,6 +107,8 @@ def test_lock_check_up_to_date(

tester = command_tester_factory("lock", poetry=poetry_with_up_to_date_lockfile)
status_code = tester.execute("--check")
expected = "poetry.lock is consistent with pyproject.toml.\n"
assert tester.io.fetch_output() == expected

# exit with an error
assert status_code == 0
Expand Down