Merge ~rgildein/juju-verify:release/fix-direct-references into ~canonical-solutions-engineering/juju-verify:master

[Robert Gildein]

fix Pypi release

The zaza and zaza-openstack was moved to tox.ini, due to the fact that
Pypi no longer supports direct dependency.

[🤖 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)]

A CI job is currently in progress. A follow up comment will be added when it completes.

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

PASSED: Continuous integration, rev:a66142b6a43cc425dde514fdbcb1eec4e4866b26
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/55/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-full/48/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/225/

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

review: Approve (continuous-integration)

[Alvaro Uria (aluria)]

Added a few comments inline.

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

A CI job is currently in progress. A follow up comment will be added when it completes.

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

PASSED: Continuous integration, rev:9b24998bc8d18af27a776a86474469225823e487
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/56/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-full/49/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/226/

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

review: Approve (continuous-integration)

[Alvaro Uria (aluria)]

Change looks good. However, this one is interesting: pylint for the tests/ folder fails on my laptop (not in the CI env, apparently):
************* Module tests
tests/__init__.py:1:0: F0010: error while code parsing: Unable to load file tests/__init__.py:
[Errno 2] No such file or directory: 'tests/__init__.py' (parse-error)

By disabling the error in tox.ini, no other issues were seen:
"""
- pylint {toxinidir}/tests/ --disable=E1101,R0913,R0914,W0212,R0801
+ pylint {toxinidir}/tests/ --disable=E1101,R0913,R0914,W0212,R0801,F0010
"""

[Robert Gildein (rgildein)]

I wonder what version of python you are using? I'll add this error to disable.

> Change looks good. However, this one is interesting: pylint for the tests/
> folder fails on my laptop (not in the CI env, apparently):
> ************* Module tests
> tests/__init__.py:1:0: F0010: error while code parsing: Unable to load file
> tests/__init__.py:
> [Errno 2] No such file or directory: 'tests/__init__.py' (parse-error)
>
> By disabling the error in tox.ini, no other issues were seen:
> """
> - pylint {toxinidir}/tests/ --disable=E1101,R0913,R0914,W0212,R0801
> + pylint {toxinidir}/tests/ --disable=E1101,R0913,R0914,W0212,R0801,F0010
> """

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

A CI job is currently in progress. A follow up comment will be added when it completes.

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

PASSED: Continuous integration, rev:216019be1d56998f94755a53ace64d7b7c3bedf2
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/57/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-full/50/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/228/

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

review: Approve (continuous-integration)

[Alvaro Uria (aluria)]

review: Approve

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

Change successfully merged at revision c7e89118339ea08f0a8024a520f76a6d66740c2e

diff --git a/setup.cfg b/setup.cfg
index b117068..4a2f0a2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -43,8 +43,9 @@ dev =
     mypy
     tox >= 3.15.0
     python-openstackclient
-    zaza @ git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-    zaza-openstack @ git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+# NOTE (rgildein): The zaza and zaza-openstack packages were moved to tox.ini, due to
+#                  the fact that Pypi no longer supports direct dependency.
+#                  https://github.com/pypa/warehouse/issues/7136
 
 verify =
     twine
diff --git a/tox.ini b/tox.ini
index 1138ca2..d105f10 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,20 +2,23 @@
 skipsdist=True
 envlist = lint, unit
 requires =
-  pip >= 20.3
+    pip >= 20.3
 
 [testenv]
 setenv =
-  PYTHONPATH={toxinidir}:{toxinidir}/tests/functional
+    PYTHONPATH={toxinidir}:{toxinidir}/tests/functional
 passenv =
-  HOME
-  PATH
-  MODEL_SETTINGS
-  HTTP_PROXY
-  HTTPS_PROXY
-  NO_PROXY
-  OS_*
-deps = .[dev]
+    HOME
+    PATH
+    MODEL_SETTINGS
+    HTTP_PROXY
+    HTTPS_PROXY
+    NO_PROXY
+    OS_*
+deps =
+    .[dev]
+    {lint,func,func-debug}: zaza @ git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+    {lint,func,func-debug}: zaza-openstack @ git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
 commands = pytest -v \
     --cov=juju_verify \
     --cov-fail-under 100 \
@@ -29,12 +32,11 @@ basepython = python3
 
 [testenv:lint]
 basepython = python3
-deps = .[dev]
 commands =
     flake8 {toxinidir}/juju_verify/ {toxinidir}/tests/
     mypy {toxinidir}/juju_verify/
     pylint {toxinidir}/juju_verify/
-    pylint {toxinidir}/tests/ --disable=E1101,R0913,R0914,W0212,R0801
+    pylint {toxinidir}/tests/ --disable=E1101,R0913,R0914,W0212,R0801,F0010
 
 [testenv:build]
 basepython = python3
@@ -73,13 +75,9 @@ basepython = python3
 changedir = {toxinidir}/tests/functional
 commands =
     functest-run-suite {posargs}
-deps =
-  .[dev]
 
 [testenv:func-debug]
 basepython = python3
 changedir = {toxinidir}/tests/functional
 commands =
     functest-run-suite {posargs} --keep-model --log DEBUG
-deps =
-  .[dev]