Merge remote-tracking branch 'origin/master' into update-async-tests

juju · Aug 23, 2023 · 42648d0 · 42648d0
2 parents b5c8b53 + 28f31fa
commit 42648d0
Show file tree

Hide file tree

Showing 139 changed files with 458 additions and 67 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -21,7 +21,9 @@ jobs:
       - name: Install dependencies
         run: pip install tox
       - name: Run linter
-        run: tox -e lint
+        run: |
+          tox -e lint
+          ./scripts/copyright.sh
 
   unit-tests:
     needs: lint

diff --git a/Makefile b/Makefile
@@ -25,7 +25,9 @@ test: lint
 	tox -e integration
 
 .PHONY: lint
-lint: 
+lint:
+	@./scripts/copyright.sh
+	@echo "==> Running flake8 linter"
 	tox -e lint
 
 .PHONY: docs

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 # -*- coding: utf-8 -*-
 #
 # libjuju documentation build configuration file, created by

diff --git a/examples/action.py b/examples/action.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/add_k8s.py b/examples/add_k8s.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/add_machine.py b/examples/add_machine.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
 
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/add_model.py b/examples/add_model.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/add_secrets_backend.py b/examples/add_secrets_backend.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 from juju import jasyncio
 from juju.model import Model
 

diff --git a/examples/allwatcher.py b/examples/allwatcher.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/charmhub_deploy_k8s.py b/examples/charmhub_deploy_k8s.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/charmhub_deploy_machine.py b/examples/charmhub_deploy_machine.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/charmhub_find.py b/examples/charmhub_find.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 Example to show how to connect to the current model and search the charm-hub
 repository for charms.

diff --git a/examples/charmhub_info.py b/examples/charmhub_info.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 Example to show how to connect to the current model and query the charm-hub
 repository for information about a given charm.

diff --git a/examples/cloud.py b/examples/cloud.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/clouds.py b/examples/clouds.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/config.py b/examples/config.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/connect_current_model.py b/examples/connect_current_model.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This is a very basic example that connects to the currently selected model
 and prints the number of applications deployed to it.

diff --git a/examples/controller.py b/examples/controller.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/credential.py b/examples/credential.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 import sys
 from juju import jasyncio
 from juju.controller import Controller

diff --git a/examples/crossmodel.py b/examples/crossmodel.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/crossmodel_bundle.py b/examples/crossmodel_bundle.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/crossmodel_controller.py b/examples/crossmodel_controller.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/crossmodel_relation.py b/examples/crossmodel_relation.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/debug-log.py b/examples/debug-log.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example demonstrate how debug-log works
 

diff --git a/examples/deploy.py b/examples/deploy.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/deploy_bundle.py b/examples/deploy_bundle.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/deploy_bundle_charmhub.py b/examples/deploy_bundle_charmhub.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 1. Connects to the current model

diff --git a/examples/deploy_bundle_with_trust.py b/examples/deploy_bundle_with_trust.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/deploy_constraints.py b/examples/deploy_constraints.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/deploy_local_big_k8s_bundle.py b/examples/deploy_local_big_k8s_bundle.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/deploy_local_bundle_with_resources.py b/examples/deploy_local_bundle_with_resources.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/deploy_local_file_resource.py b/examples/deploy_local_file_resource.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/deploy_local_resource.py b/examples/deploy_local_resource.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/deploy_with_revision.py b/examples/deploy_with_revision.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 from juju import jasyncio
 from juju.model import Model
 

diff --git a/examples/expose-application.py b/examples/expose-application.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/formatted_status.py b/examples/formatted_status.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example demonstrates how to obtain a formatted full status
 description. For a similar solution using the FullStatus object

diff --git a/examples/fullstatus.py b/examples/fullstatus.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 from juju import jasyncio
 from juju.model import Model
 

diff --git a/examples/future.py b/examples/future.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example doesn't work - it demonstrates features that don't exist yet.
 

diff --git a/examples/get_cloud.py b/examples/get_cloud.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/leadership.py b/examples/leadership.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/list_secrets.py b/examples/list_secrets.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 from juju import jasyncio
 from juju.model import Model
 

diff --git a/examples/livemodel.py b/examples/livemodel.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/local_refresh.py b/examples/local_refresh.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/localcharm.py b/examples/localcharm.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example shows how to deploy a local charm. It:
 

diff --git a/examples/machine_hostname.py b/examples/machine_hostname.py
@@ -1,5 +1,9 @@
 #!/usr/bin/env python3
 
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
+
 """
 This example:
 

diff --git a/examples/model.py b/examples/model.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example shows how to reconnect to a model if you encounter an error
 

diff --git a/examples/modelsummaries.py b/examples/modelsummaries.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/relate.py b/examples/relate.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/run_action.py b/examples/run_action.py
@@ -1,3 +1,5 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
 
 from juju import jasyncio
 from juju.model import Model

diff --git a/examples/scp.py b/examples/scp.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This is a very basic example that connects to the currently selected model
 and prints the number of applications deployed to it.

diff --git a/examples/status.py b/examples/status.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example demonstrate how status works
 

diff --git a/examples/unitrun.py b/examples/unitrun.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/examples/upgrade_local_charm_k8s.py b/examples/upgrade_local_charm_k8s.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 """
 This example:
 

diff --git a/juju/access.py b/juju/access.py
@@ -1,3 +1,5 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
 
 from .errors import JujuNotValid
 

diff --git a/juju/action.py b/juju/action.py
@@ -1,3 +1,6 @@
+# Copyright 2023 Canonical Ltd.
+# Licensed under the Apache V2, see LICENCE file for details.
+
 from . import model