[resoto][chore] Upgrade to tox 4 (#1438)

* [resoto][chore] Upgrade to tox 4 * fix resotoworker * move pyyaml to resotolib * fix onprem
someengineering · Feb 13, 2023 · 00cc6d5 · 00cc6d5
1 parent 7c1c8fb
commit 00cc6d5
Show file tree

Hide file tree

Showing 51 changed files with 114 additions and 65 deletions.
diff --git a/plugins/aws/resoto_plugin_aws/resource/base.py b/plugins/aws/resoto_plugin_aws/resource/base.py
@@ -418,7 +418,7 @@ def nodes(self, clazz: Optional[Type[AwsResourceType]] = None, **node: Any) -> I
         for n in self.graph:
             is_clazz = isinstance(n, clazz) if clazz else True
             if is_clazz and all(getattr(n, k, None) == v for k, v in node.items()):
-                yield n  # type: ignore
+                yield n
 
     def add_node(
         self, node: AwsResourceType, source: Optional[Json] = None, region: Optional[AwsRegion] = None

diff --git a/plugins/aws/test/resources/base_test.py b/plugins/aws/test/resources/base_test.py
@@ -3,6 +3,7 @@
 
 from resoto_plugin_aws.resource.base import ExecutorQueue, AwsRegion, GraphBuilder
 from resoto_plugin_aws.resource.ec2 import AwsEc2InstanceType
+from test import account_collector, builder, aws_client, aws_config, no_feedback  # noqa: F401
 
 
 def check_executor_queue(work: Sequence[int], fail_on_first_exception: bool) -> Tuple[List[int], Optional[Exception]]:
@@ -48,9 +49,6 @@ def test_fail_late() -> None:
     assert ex.args[0] == "Abort 5"
 
 
-from test import account_collector, builder, aws_client, aws_config, no_feedback  # noqa: F401
-
-
 def test_instance_type_handling(builder: GraphBuilder) -> None:
     region1 = AwsRegion(id="us-east-1")
     region2 = AwsRegion(id="us-east-2")

diff --git a/plugins/aws/tools/awspolicygen/tox.ini b/plugins/aws/tools/awspolicygen/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache
@@ -14,7 +17,7 @@ deps =
    -rrequirements.txt
 
 [testenv:syntax]
-commands = flake8 --verbose
+commands = flake8
 
 [testenv:black]
 commands = black --line-length 120 --check --diff --target-version py39 .
diff --git a/plugins/aws/tools/model_gen.py b/plugins/aws/tools/model_gen.py
@@ -1,4 +1,4 @@
-import json
+import json  # noqa: F401
 import re
 from textwrap import dedent
 from typing import List, Set, Optional, Tuple, Union, Dict

diff --git a/plugins/aws/tox.ini b/plugins/aws/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black, mypy
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache
@@ -16,7 +19,7 @@ deps =
    -r../../resotolib/requirements-test.txt
 
 [testenv:syntax]
-commands = flake8 --verbose
+commands = flake8
 
 [testenv:tests]
 commands= pytest
@@ -25,7 +28,4 @@ commands= pytest
 commands = black --line-length 120 --check --diff --target-version py39 .
 
 [testenv:mypy]
-commands=
-  - python -m mypy --python-version 3.9 resoto_plugin_aws test
-  - python -m mypy --install-types --non-interactive --python-version 3.9 resoto_plugin_aws test
-  python -m mypy --python-version 3.9 --strict resoto_plugin_aws test
+commands= python -m mypy --install-types --non-interactive --python-version 3.9 --strict resoto_plugin_aws test
diff --git a/plugins/aws_k8s/tox.ini b/plugins/aws_k8s/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black, mypy
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache
@@ -25,7 +28,4 @@ commands= pytest
 commands = black --line-length 120 --check --diff --target-version py39 .
 
 [testenv:mypy]
-commands=
-  - python -m mypy --python-version 3.9 resoto_plugin_aws_k8s test
-  - python -m mypy --install-types --non-interactive --python-version 3.9 resoto_plugin_aws_k8s test
-  python -m mypy --python-version 3.9 --strict resoto_plugin_aws_k8s test
+commands= python -m mypy --install-types --non-interactive --python-version 3.9 --strict resoto_plugin_aws_k8s test
diff --git a/plugins/cleanup_aws_alarms/requirements.txt b/plugins/cleanup_aws_alarms/requirements.txt
@@ -1,3 +1,2 @@
 resotolib==3.2.0
 resoto-plugin-aws==3.2.0
-PyYAML>=6.0
diff --git a/plugins/cleanup_aws_alarms/tox.ini b/plugins/cleanup_aws_alarms/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/cleanup_aws_loadbalancers/tox.ini b/plugins/cleanup_aws_loadbalancers/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/cleanup_aws_vpcs/requirements.txt b/plugins/cleanup_aws_vpcs/requirements.txt
@@ -1,3 +1,2 @@
 resotolib==3.2.0
 resoto-plugin-aws==3.2.0
-PyYAML>=6.0
diff --git a/plugins/cleanup_aws_vpcs/tox.ini b/plugins/cleanup_aws_vpcs/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/cleanup_expired/tox.ini b/plugins/cleanup_expired/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/cleanup_untagged/requirements.txt b/plugins/cleanup_untagged/requirements.txt
@@ -1,2 +1 @@
 resotolib==3.2.0
-PyYAML>=6.0
diff --git a/plugins/cleanup_untagged/tox.ini b/plugins/cleanup_untagged/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/cleanup_volumes/tox.ini b/plugins/cleanup_volumes/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/digitalocean/tox.ini b/plugins/digitalocean/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black, mypy
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache
@@ -25,7 +28,4 @@ commands= pytest
 commands = black --line-length 120 --check --diff --target-version py39 .
 
 [testenv:mypy]
-commands=
-  - python -m mypy --python-version 3.9 resoto_plugin_digitalocean test
-  - python -m mypy --install-types --non-interactive --python-version 3.9 resoto_plugin_digitalocean test
-  python -m mypy --python-version 3.9 --strict resoto_plugin_digitalocean test
+commands= python -m mypy --install-types --non-interactive --python-version 3.9 --strict resoto_plugin_digitalocean test
diff --git a/plugins/digitalocean_k8s/tox.ini b/plugins/digitalocean_k8s/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black, mypy
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache
@@ -25,7 +28,4 @@ commands= pytest
 commands = black --line-length 120 --check --diff --target-version py39 .
 
 [testenv:mypy]
-commands=
-  - python -m mypy --python-version 3.9 resoto_plugin_digitalocean_k8s test
-  - python -m mypy --install-types --non-interactive --python-version 3.9 resoto_plugin_digitalocean_k8s test
-  python -m mypy --python-version 3.9 --strict resoto_plugin_digitalocean_k8s test
+commands= python -m mypy --install-types --non-interactive --python-version 3.9 --strict resoto_plugin_digitalocean_k8s test
diff --git a/plugins/dockerhub/tox.ini b/plugins/dockerhub/tox.ini
@@ -1,3 +1,5 @@
+[tox]
+env_list = syntax, tests, black
 
 [flake8]
 max-line-length=120

diff --git a/plugins/example_collector/tox.ini b/plugins/example_collector/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/gcp/resoto_plugin_gcp/project_collector.py b/plugins/gcp/resoto_plugin_gcp/project_collector.py
@@ -69,9 +69,7 @@ def collect_region(self, region: GcpRegion, regional_builder: GraphBuilder) -> N
     cloud = Cloud(id="Gcp", name="Gcp")
     project = GcpProject(id="inbound-axon-320811", name="inbound-axon-320811")
     feedback = CoreFeedback("test", "test", "test", Queue())
-    Credentials._credentials[project.id] = OauthCredentials.from_service_account_file(
-        "/Users/matthias/.gcp/test.json"
-    )
+    Credentials._credentials[project.id] = OauthCredentials.from_service_account_file("/Users/matthias/.gcp/test.json")
     Credentials._initialized = True
     collector = GcpProjectCollector(GcpConfig(), cloud, project, feedback)
     collector.collect()

diff --git a/plugins/gcp/resoto_plugin_gcp/resources/container.py b/plugins/gcp/resoto_plugin_gcp/resources/container.py
@@ -1,10 +1,9 @@
 from typing import ClassVar, Dict, Optional, List
 
 from attr import define, field
-from resoto_plugin_aws.resource.base import GraphBuilder
 
 from resoto_plugin_gcp.gcp_client import GcpApiSpec
-from resoto_plugin_gcp.resources.base import GcpResource, GcpDeprecationStatus
+from resoto_plugin_gcp.resources.base import GcpResource, GcpDeprecationStatus, GraphBuilder
 from resotolib.baseresources import ModelReference
 from resotolib.json_bender import Bender, S, Bend, ForallBend, MapDict
 from resotolib.types import Json

diff --git a/plugins/gcp/resoto_plugin_gcp/resources/sqladmin.py b/plugins/gcp/resoto_plugin_gcp/resources/sqladmin.py
@@ -1,10 +1,9 @@
 from typing import ClassVar, Dict, Optional, List
 
 from attr import define, field
-from resoto_plugin_aws.resource.base import GraphBuilder
 
 from resoto_plugin_gcp.gcp_client import GcpApiSpec
-from resoto_plugin_gcp.resources.base import GcpResource, GcpDeprecationStatus
+from resoto_plugin_gcp.resources.base import GcpResource, GcpDeprecationStatus, GraphBuilder
 from resoto_plugin_gcp.resources.compute import GcpSslCertificate
 from resotolib.baseresources import ModelReference
 from resotolib.json_bender import Bender, S, Bend, ForallBend

diff --git a/plugins/gcp/tox.ini b/plugins/gcp/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = flake8, syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/github/tox.ini b/plugins/github/tox.ini
@@ -1,3 +1,5 @@
+[tox]
+env_list = syntax, tests, black
 
 [flake8]
 max-line-length=120

diff --git a/plugins/k8s/tox.ini b/plugins/k8s/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black, mypy
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache,test
@@ -25,7 +28,4 @@ commands= pytest
 commands = black --line-length 120 --check --diff --target-version py39 .
 
 [testenv:mypy]
-commands=
-  - python -m mypy --python-version 3.9 resoto_plugin_k8s test
-  - python -m mypy --install-types --non-interactive --python-version 3.9 resoto_plugin_k8s test
-  python -m mypy --python-version 3.9 --strict resoto_plugin_k8s test
+commands= python -m mypy --install-types --non-interactive --python-version 3.9 --strict resoto_plugin_k8s test
diff --git a/plugins/onelogin/tox.ini b/plugins/onelogin/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/onprem/resoto_plugin_onprem/resources.py b/plugins/onprem/resoto_plugin_onprem/resources.py
@@ -7,7 +7,6 @@
     BaseInstance,
     BaseNetwork,
 )
-from resotolib.logger import log
 
 
 @define(eq=False, slots=False)

diff --git a/plugins/onprem/tox.ini b/plugins/onprem/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/posthog/tox.ini b/plugins/posthog/tox.ini
@@ -1,3 +1,5 @@
+[tox]
+env_list = syntax, tests, black
 
 [flake8]
 max-line-length=120

diff --git a/plugins/protector/requirements.txt b/plugins/protector/requirements.txt
@@ -1,2 +1 @@
 resotolib==3.2.0
-PyYAML>=6.0
diff --git a/plugins/protector/tox.ini b/plugins/protector/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/random/tox.ini b/plugins/random/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/scarf/tox.ini b/plugins/scarf/tox.ini
@@ -1,3 +1,5 @@
+[tox]
+env_list = syntax, tests, black
 
 [flake8]
 max-line-length=120

diff --git a/plugins/slack/tox.ini b/plugins/slack/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/tagvalidator/requirements.txt b/plugins/tagvalidator/requirements.txt
@@ -1,2 +1 @@
 resotolib==3.2.0
-PyYAML>=6.0
diff --git a/plugins/tagvalidator/tox.ini b/plugins/tagvalidator/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/plugins/vsphere/tox.ini b/plugins/vsphere/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black
+
 [flake8]
 max-line-length=120
 exclude = .git,.tox,__pycache__,.idea,.pytest_cache

diff --git a/resotocore/requirements-dev.txt b/resotocore/requirements-dev.txt
@@ -3,7 +3,7 @@ mypy==1.0.0
 wheel==0.38.4
 flake8==6.0.0
 pep8-naming==0.13.3
-tox==3.28.0
+tox==4.4.5
 coverage==7.1.0
 setuptools==67.2.0
 pylint==2.16.1

diff --git a/resotocore/requirements.txt b/resotocore/requirements.txt
@@ -13,7 +13,6 @@ APScheduler==3.10.0
 aiostream==0.4.5
 tzlocal==4.2
 frozendict==2.1.3 # 2.2.0 can not be marshalled as json any longer
-PyYAML==6.0
 resotolib==3.2.0
 jq==1.4.0
 posthog==2.3.1

diff --git a/resotocore/tox.ini b/resotocore/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black, mypy
+
 [pytest]
 testpaths= tests
 asyncio_mode= auto
@@ -11,7 +14,7 @@ deps =
    -rrequirements.txt
 
 [testenv:syntax]
-commands = flake8 --verbose resotocore
+commands = flake8 resotocore
 
 [testenv:tests]
 commands = pytest
@@ -20,7 +23,4 @@ commands = pytest
 commands = black --line-length 120 --check --diff --target-version py39 .
 
 [testenv:mypy]
-commands=
-  - python -m mypy --python-version 3.9 resotocore tests
-  - python -m mypy --install-types --non-interactive --python-version 3.9 resotocore tests
-  python -m mypy --python-version 3.9 --strict resotocore tests
+commands= python -m mypy --install-types --non-interactive --python-version 3.9 --strict resotocore tests
diff --git a/resotoeventlog/requirements-dev.txt b/resotoeventlog/requirements-dev.txt
@@ -3,7 +3,7 @@ mypy==1.0.0
 wheel==0.38.4
 flake8==6.0.0
 pep8-naming==0.13.3
-tox==3.28.0
+tox==4.4.5
 coverage==7.1.0
 black==23.1.0
 build==0.10.0
diff --git a/resotoeventlog/tox.ini b/resotoeventlog/tox.ini
@@ -1,3 +1,6 @@
+[tox]
+env_list = syntax, tests, black, mypy
+
 [pytest]
 testpaths= tests
 asyncio_mode= auto
@@ -20,7 +23,4 @@ commands = pytest -s
 commands = black --line-length 120 --check --diff --target-version py39 .
 
 [testenv:mypy]
-commands=
-  - python -m mypy --python-version 3.9 resotoeventlog tests
-  - python -m mypy --install-types --non-interactive --python-version 3.9 resotoeventlog tests
-  python -m mypy --python-version 3.9 --strict resotoeventlog tests
+commands= python -m mypy --install-types --non-interactive --python-version 3.9 --strict resotoeventlog tests