From 650adf7a5f06bfacfe77b6085ce608a3064b352f Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Tue, 13 Jun 2023 15:17:12 -0300 Subject: [PATCH] WIP craft-cli from main --- requirements-devel.txt | 3 ++- requirements.txt | 3 ++- snapcraft/parts/lifecycle.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements-devel.txt b/requirements-devel.txt index f16806b8fe3..53007c5c62c 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -12,7 +12,8 @@ codespell==2.2.4 colorama==0.4.6 coverage==7.2.5 craft-archives==1.0.0 -craft-cli==1.2.0 +#craft-cli==1.2.0 +git+https://github.com/canonical/craft-cli.git@main#egg=craft_cli craft-grammar==1.1.1 craft-parts==1.21.1 craft-providers==1.13.0 diff --git a/requirements.txt b/requirements.txt index e58b7745d2c..204ac968f61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,8 @@ chardet==5.1.0 charset-normalizer==3.1.0 click==8.1.3 craft-archives==1.0.0 -craft-cli==1.2.0 +#craft-cli==1.2.0 +git+https://github.com/canonical/craft-cli.git@main#egg=craft_cli craft-grammar==1.1.1 craft-parts==1.21.1 craft-providers==1.13.0 diff --git a/snapcraft/parts/lifecycle.py b/snapcraft/parts/lifecycle.py index 006837ca32f..73c44f63364 100644 --- a/snapcraft/parts/lifecycle.py +++ b/snapcraft/parts/lifecycle.py @@ -341,7 +341,7 @@ def _run_lifecycle_and_pack( parsed_args: "argparse.Namespace", ) -> None: """Execute the parts lifecycle, generate metadata, and create the snap.""" - emit.message("USING craft-cli version 1.2.0") + emit.message("USING craft-cli from branch 'main'") with ua_manager.ua_manager(parsed_args.ua_token, services=project.ua_services): lifecycle.run( step_name,