add correct deps for new data-platform plugin

canonical · Oct 26, 2023 · 09e195e · 09e195e
1 parent ffa795a
commit 09e195e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -10,7 +10,6 @@
 from pytest_operator.plugin import OpsTest
 
 
-@pytest.fixture(scope="module")
 def ops_test(ops_test: OpsTest) -> OpsTest:
     if os.environ.get("CI") == "true":
         # Running in GitHub Actions; skip build step

diff --git a/tox.ini b/tox.ini
@@ -72,12 +72,12 @@ description = Run charm integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
 deps =
     pytest
     juju==3.2.0.1
     pytest-operator
     pytest-mock
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/test_charm.py
@@ -87,12 +87,12 @@ description = Run high availability integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
 deps =
     pytest
     juju==3.2.0.1
     pytest-mock
     pytest-operator
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -vvv --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/ha_tests/test_ha.py
@@ -102,12 +102,12 @@ description = Run new relation integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
 deps =
     pytest
     juju==3.2.0.1
     pytest-mock
     pytest-operator
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/relation_tests/new_relations/test_charm_relations.py
@@ -117,12 +117,12 @@ description = Run legacy relation integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
 deps =
     pytest
     juju==3.2.0.1
     pytest-mock
     pytest-operator
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/relation_tests/legacy_relations/test_charm_legacy_relations.py
@@ -132,12 +132,12 @@ description = Run tls integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
 deps =
     pytest
     juju==3.2.0.1
     pytest-mock
     pytest-operator
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/tls_tests/test_tls.py
@@ -148,7 +148,6 @@ description = Run backup integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
     AWS_ACCESS_KEY
     AWS_SECRET_KEY
     GCP_ACCESS_KEY
@@ -158,6 +157,7 @@ deps =
     juju==3.2.0.1
     pytest-mock
     pytest-operator
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/backup_tests/test_backups.py
@@ -167,12 +167,12 @@ description = Run metrics integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
 deps =
     pytest
     juju==3.2.0.1
     pytest-mock
     pytest-operator
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/metrics_tests/test_metrics.py
@@ -182,12 +182,12 @@ description = Run sharding integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
 deps =
     pytest
     juju==3.2.0.1
     pytest-mock
     pytest-operator
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/sharding_tests/test_sharding.py
@@ -198,12 +198,12 @@ description = Run all integration tests
 pass_env =
     {[testenv]pass_env}
     CI
-    CI_PACKED_CHARMS
 deps =
     pytest
     juju==3.2.0.1
     pytest-mock
     pytest-operator
+    git+https://github.com/canonical/data-platform-workflows@v5.1.2\#subdirectory=python/pytest_plugins/pytest_operator_cache
     -r {tox_root}/requirements.txt
 commands =
     pytest -v --tb native --log-cli-level=INFO -s --durations=0 {posargs} {[vars]tests_path}/integration/