Skip to content

Commit

Permalink
chore: update craft-cli
Browse files Browse the repository at this point in the history
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
  • Loading branch information
sergiusens committed Nov 7, 2023
1 parent c81f81b commit 28be157
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ attrs==23.1.0
catkin-pkg==0.5.2
click==8.1.3
craft-archives==1.1.3
craft-cli==2.1.0
craft-cli==2.4.0
craft-grammar==1.1.1
craft-parts==1.25.1
craft-providers==1.19.2
Expand Down
2 changes: 1 addition & 1 deletion requirements-devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ codespell==2.2.4
colorama==0.4.6
coverage==7.2.5
craft-archives==1.1.3
craft-cli==2.1.0
craft-cli==2.4.0
craft-grammar==1.1.1
craft-parts==1.25.1
craft-providers==1.19.2
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ chardet==5.1.0
charset-normalizer==3.1.0
click==8.1.3
craft-archives==1.1.3
craft-cli==2.1.0
craft-cli==2.4.0
craft-grammar==1.1.1
craft-parts==1.25.1
craft-providers==1.19.2
Expand Down
3 changes: 0 additions & 3 deletions snapcraft/parts/parts.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ def run(

self._install_package_repositories()

emit.progress("Initialising lifecycle")
with self._lcm.action_executor() as aex:
for action in actions:
# Workaround until canonical/craft-parts#540 is fixed
Expand All @@ -186,14 +185,12 @@ def run(
properties=action.properties,
)
message = _get_parts_action_message(action)
emit.progress(message)
with emit.open_stream(message) as stream:
aex.execute(action, stdout=stream, stderr=stream)

if shell_after:
launch_shell()

emit.progress("Executed parts lifecycle", permanent=True)
except RuntimeError as err:
raise RuntimeError(f"Parts processing internal error: {err}") from err
except OSError as err:
Expand Down
1 change: 0 additions & 1 deletion tests/unit/parts/test_parts.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ def test_parts_lifecycle_run(mocker, parts_data, step_name, new_dir, emitter):
project_base="core22",
)
]
emitter.assert_progress(f"Executing parts lifecycle: {step_name} p1")


def test_parts_lifecycle_run_bad_step(parts_data, new_dir):
Expand Down

0 comments on commit 28be157

Please sign in to comment.