Merge ~mertkirpici/juju-lint:topic/juju-3.1 into juju-lint:master

[Mert Kirpici]

chore: add juju 3.1 support

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

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:cd05408592460d420d1b773a51c7e4553955a3ee
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/14/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1798/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/511/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/14//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:cd05408592460d420d1b773a51c7e4553955a3ee
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1799/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/512/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/15//rebuild

review: Approve (continuous-integration)

[Mert Kirpici (mertkirpici)]

waiting for 3.1 pipeline. do not merge yet.

[Mert Kirpici (mertkirpici)]

successful 3.1 run: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest-31/215/parameters/

[Robert Gildein (rgildein)]

LGTM

review: Approve

[Tianqi Xiao (txiao)]

LGTM

review: Approve

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

Change successfully merged at revision b0aba6b1fde897f1af7922dcd866cd0e7d63964c

diff --git a/Makefile b/Makefile
index 887786e..8a41472 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ help:
 	@echo " make reformat - run black and isort and reformat files"
 	@echo " make unittests - run the tests defined in the unittest subdirectory"
 	@echo " make functional - run the tests defined in the functional subdirectory"
+	@echo " make functional31 - run the tests defined in the functional subdirectory with juju 3.1 requirements"
 	@echo " make test - run lint, proof, unittests and functional targets"
 	@echo " make pre-commit - run pre-commit checks on all the files"
 	@echo ""
@@ -57,8 +58,12 @@ functional: build
 	@echo "Executing functional tests using built snap"
 	@TEST_SNAP=${SNAP_FILE} tox -e func -- ${FUNC_ARGS}
 
+functional31: build
+	@echo "Executing functional tests using built snap with juju 3.1 requirements"
+	@TEST_SNAP=${SNAP_FILE} tox -e func31 -- ${FUNC_ARGS}
+
 pre-commit:
 	@tox -e pre-commit
 
 # The targets below don't depend on a file
-.PHONY: help clean dev-environment build lint reformat unittests functional test pre-commit
+.PHONY: help clean dev-environment build lint reformat unittests functional functional31 test pre-commit
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
index eab92d5..6a1cad4 100644
--- a/tests/functional/requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1,5 +1,3 @@
 pytest
 pytest-operator
 pytest-httpserver
-# pin juju library to maintain compatibility with Juju controller < 3.0
-juju < 3.0
diff --git a/tox.ini b/tox.ini
index f6d4326..65fe08d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,6 +61,16 @@ setenv = PYTHONPATH={toxinidir}
 deps =
     -r{toxinidir}/tests/functional/requirements.txt
     -r{toxinidir}/requirements.txt
+    juju<3
+passenv =
+    TEST_*
+commands =
+    pytest {toxinidir}/tests/functional {posargs:-v}
+
+[testenv:func31]
+deps =
+    -r{toxinidir}/tests/functional/requirements.txt
+    -r{toxinidir}/requirements.txt
 passenv =
     TEST_*
 commands =