Merge ~mthaddon/charm-ubuntu-advantage/+git/charm-ubuntu-advantage:master into charm-ubuntu-advantage:master

[Tom Haddon]

Fix lint

Fix lint. Was previously getting the following from `lpcraft run`:

mthaddon@finistere:~/repos/charm-ubuntu-advantage/charm-ubuntu-advantage$ lpcraft run
Starting lpcraft, version 0.0.50
Logging execution to '/home/mthaddon/.local/state/lpcraft/log/lpcraft-20230321-151533.958935.log'
Running ['bash', '--noprofile', '--norc', '-ec', 'tox -e lint\n']
:: lint recreate: /build/lpcraft/project/.tox/lint
:: lint installdeps: black, flake8, flake8-docstrings, flake8-copyright, flake8-builtins, pyproject-flake8, pep8-naming, isort, codespell
:: lint installed: black==23.1.0,click==8.1.3,codespell==2.2.4,flake8==6.0.0,flake8-builtins==2.1.0,flake8-copyright==0.2.4,flake8-docstrings==1.7.0,isort==5.12.0,mccabe==0.7.0,mypy-extensions==1.0.0,packaging==23.0,pathspec==0.11.1,pep8-naming==0.13.3,platformdirs==3.1.1,pycodestyle==2.10.0,pydocstyle==6.3.0,pyflakes==3.0.1,pyproject-flake8==6.0.0.post1,snowballstemmer==2.2.0,tomli==2.0.1,typing-extensions==4.5.0
:: lint run-test-pre: PYTHONHASHSEED='4218751226'
:: lint run-test: commands[0] | codespell '/build/lpcraft/project/*.yaml' '/build/lpcraft/project/*.ini' '/build/lpcraft/project/*.md' '/build/lpcraft/project/*.toml' '/build/lpcraft/project/*.txt' /build/lpcraft/project/.github
:: lint run-test: commands[1] | pflake8 /build/lpcraft/project/src/ /build/lpcraft/project/tests/
:: lint run-test: commands[2] | isort --check-only --diff /build/lpcraft/project/src/ /build/lpcraft/project/tests/
:: lint run-test: commands[3] | black --check --diff /build/lpcraft/project/src/ /build/lpcraft/project/tests/
:: --- /build/lpcraft/project/tests/integration/test_charm.py 2022-10-30 12:52:09.022063 +0000
:: +++ /build/lpcraft/project/tests/integration/test_charm.py 2023-03-21 14:18:45.273814 +0000
:: @@ -6,11 +6,10 @@
:: from pytest_operator.plugin import OpsTest
::
::
:: @pytest.mark.abort_on_fail
:: async def test_build_and_deploy(ops_test: OpsTest):
:: -
:: charm = await ops_test.build_charm(".")
:: await ops_test.model.deploy("ubuntu")
:: await ops_test.model.deploy(charm, num_units=0)
:: await ops_test.model.add_relation(
:: "ubuntu",
:: would reformat /build/lpcraft/project/tests/integration/test_charm.py
::
:: Oh no! 💥 💔 💥
:: 1 file would be reformatted, 2 files would be left unchanged.
:: ERROR: InvocationError for command /build/lpcraft/project/.tox/lint/bin/black --check --diff src tests (exited with code 1)
:: ___________________________________ summary ____________________________________
:: ERROR: lint: commands failed
Job 'lint' for focal/amd64 failed with exit status 1.
Full execution log: '/home/mthaddon/.local/state/lpcraft/log/lpcraft-20230321-151533.958935.log'

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Ivo Jansky (ijansky)]

review: Approve

[Andrew Polukhin (andrew-polukhin)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 36fec37bc326fff172098b29ffbd83f634e21692

diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
index 2066e26..14b4943 100644
--- a/tests/integration/test_charm.py
+++ b/tests/integration/test_charm.py
@@ -8,7 +8,6 @@ from pytest_operator.plugin import OpsTest
 
 @pytest.mark.abort_on_fail
 async def test_build_and_deploy(ops_test: OpsTest):
-
     charm = await ops_test.build_charm(".")
     await ops_test.model.deploy("ubuntu")
     await ops_test.model.deploy(charm, num_units=0)