From 41db968449379b658b4a2bdb65f7f0d9cb68bfec Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Thu, 20 Jun 2024 10:28:22 -0300 Subject: [PATCH 1/2] build(deps): point to temporary releases of -parts and -application --- requirements-dev.txt | 4 ++-- requirements-doc.txt | 4 ++-- requirements.txt | 4 ++-- tests/unit/test_cli.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 25a222e76..465b2aae3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -18,11 +18,11 @@ click==8.1.7 codespell==2.2.6 colorama==0.4.6 coverage==7.5.1 -craft-application==2.7.0 +craft-application @ git+https://github.com/canonical/craft-application@rockcraft craft-archives==1.1.3 craft-cli==2.5.1 craft-grammar==1.2.0 -craft-parts==1.31.0 +craft-parts @ git+https://github.com/canonical/craft-parts@rockcraft craft-providers==1.23.1 cryptography==42.0.7 Deprecated==1.2.14 diff --git a/requirements-doc.txt b/requirements-doc.txt index f7aaf7610..7bba7385e 100644 --- a/requirements-doc.txt +++ b/requirements-doc.txt @@ -10,11 +10,11 @@ cffi==1.16.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -craft-application==2.7.0 +craft-application @ git+https://github.com/canonical/craft-application@rockcraft craft-archives==1.1.3 craft-cli==2.5.1 craft-grammar==1.2.0 -craft-parts==1.31.0 +craft-parts @ git+https://github.com/canonical/craft-parts@rockcraft craft-providers==1.23.1 Deprecated==1.2.14 distro==1.9.0 diff --git a/requirements.txt b/requirements.txt index f3bb15dca..29f75e6bc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 -craft-application==2.7.0 +craft-application @ git+https://github.com/canonical/craft-application@rockcraft craft-archives==1.1.3 craft-cli==2.5.1 craft-grammar==1.2.0 -craft-parts==1.31.0 +craft-parts @ git+https://github.com/canonical/craft-parts@rockcraft craft-providers==1.23.1 Deprecated==1.2.14 distro==1.9.0 diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py index a74cdcaaf..7f8092ab3 100644 --- a/tests/unit/test_cli.py +++ b/tests/unit/test_cli.py @@ -63,7 +63,7 @@ def test_run_pack_services(mocker, monkeypatch, tmp_path): cli.run() - lifecycle_mocks["run"].assert_called_once_with(step_name="prime", part_names=[]) + lifecycle_mocks["run"].assert_called_once_with(step_name="prime") package_mocks["write_metadata"].assert_called_once_with(fake_prime_dir) package_mocks["pack"].assert_called_once_with(fake_prime_dir, Path()) From 82f88ac3a3da9479030f66cb79847172c7eb63b2 Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Thu, 20 Jun 2024 10:29:29 -0300 Subject: [PATCH 2/2] docs: add craft-parts reference to qmake plugin --- docs/reference/plugins.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/reference/plugins.rst b/docs/reference/plugins.rst index 59dba3e3f..e64db4426 100644 --- a/docs/reference/plugins.rst +++ b/docs/reference/plugins.rst @@ -22,5 +22,6 @@ Rockcraft. /common/craft-parts/reference/plugins/nil_plugin /common/craft-parts/reference/plugins/npm_plugin plugins/python_plugin + /common/craft-parts/reference/plugins/qmake_plugin /common/craft-parts/reference/plugins/rust_plugin /common/craft-parts/reference/plugins/scons_plugin