new formatting

Yelp · Jul 24, 2023 · 7bbda75 · 7bbda75
1 parent 12848be
commit 7bbda75
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 17 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -78,8 +78,8 @@ s3transfer==0.6.0
 setuptools==65.5.1
 six==1.15.0
 sshpubkeys==3.1.0
-task-processing==0.12.2
 stack-data==0.6.2
+task-processing==0.12.2
 traitlets==5.0.0
 Twisted==22.10.0
 typing-extensions==4.5.0

diff --git a/setup.py b/setup.py
@@ -27,7 +27,10 @@
         "Intended Audience :: System Administrators",
         "Development Status :: 4 - Beta",
     ],
-    packages=find_packages(exclude=["tests.*", "tests", "example-cluster"],) + ["tronweb"],
+    packages=find_packages(
+        exclude=["tests.*", "tests", "example-cluster"],
+    )
+    + ["tronweb"],
     scripts=glob.glob("bin/*") + glob.glob("tron/bin/*.py"),
     include_package_data=True,
     long_description="""

diff --git a/tests/config/config_parse_test.py b/tests/config/config_parse_test.py
@@ -446,7 +446,9 @@ class ConfigTestCase(TestCase):
                                 secret_name="secret1",
                                 container_path="/b/c",
                                 default_mode="0644",
-                                items=[dict(key="secret1", path="abcd", mode="777"),],
+                                items=[
+                                    dict(key="secret1", path="abcd", mode="777"),
+                                ],
                             ),
                         ],
                         cap_add=["KILL"],
@@ -1592,8 +1594,14 @@ class TestValidSecretVolumeItem:
         "config",
         [
             {"path": "abc"},
-            {"key": "abc",},
-            {"key": "abc", "path": "abc", "extra_key": None,},
+            {
+                "key": "abc",
+            },
+            {
+                "key": "abc",
+                "path": "abc",
+                "extra_key": None,
+            },
             {"key": "abc", "path": "abc", "mode": "a"},
         ],
     )
@@ -1602,7 +1610,8 @@ def test_invalid(self, config):
             config_parse.valid_secret_volume_item(config, NullConfigContext)
 
     @pytest.mark.parametrize(
-        "config", [{"key": "abc", "path": "abc"}, {"key": "abc", "path": "abc", "mode": "777"}],
+        "config",
+        [{"key": "abc", "path": "abc"}, {"key": "abc", "path": "abc", "mode": "777"}],
     )
     def test_valid_job_secret_volume_success(self, config):
         config_parse.valid_secret_volume_item(config, NullConfigContext)
@@ -1617,15 +1626,23 @@ class TestValidSecretVolume:
                 secret_name="secret1",
                 container_path="/b/c",
                 default_mode="0644",
-                items=[dict(key="secret1", path="abcd", mode="7778"),],
+                items=[
+                    dict(key="secret1", path="abcd", mode="7778"),
+                ],
             ),
             dict(
                 secret_volume_name="abc",
                 container_path="/b/c",
                 default_mode="0644",
-                items=[dict(key="secret1", path="abcd", mode="7777"),],
+                items=[
+                    dict(key="secret1", path="abcd", mode="7777"),
+                ],
+            ),
+            dict(
+                secret_volume_name="abc",
+                secret_name="secret1",
+                container_path=123,
             ),
-            dict(secret_volume_name="abc", secret_name="secret1", container_path=123,),
             dict(
                 secret_volume_name="abc",
                 secret_name="secret1",
@@ -1643,7 +1660,9 @@ def test_wrong_item_key(self):
             secret_volume_name="abc",
             secret_name="secret1",
             container_path="/b/c",
-            items=[dict(key="secret2", path="abc"),],
+            items=[
+                dict(key="secret2", path="abc"),
+            ],
         )
         with pytest.raises(ConfigError):
             config_parse.valid_secret_volume(config, NullConfigContext)
@@ -1656,10 +1675,21 @@ def test_wrong_item_key(self):
                 secret_name="secret1",
                 container_path="/b/c",
                 default_mode="0644",
-                items=[dict(key="secret1", path="abc"),],
+                items=[
+                    dict(key="secret1", path="abc"),
+                ],
+            ),
+            dict(
+                secret_volume_name="abc",
+                secret_name="secret1",
+                container_path="/b/c",
+                items=[],
+            ),
+            dict(
+                secret_volume_name="abc",
+                secret_name="secret1",
+                container_path="/b/c",
             ),
-            dict(secret_volume_name="abc", secret_name="secret1", container_path="/b/c", items=[],),
-            dict(secret_volume_name="abc", secret_name="secret1", container_path="/b/c",),
         ],
     )
     def test_valid(self, config):

diff --git a/tests/core/action_test.py b/tests/core/action_test.py
@@ -46,7 +46,13 @@ def test_from_config_full(self, disk):
                     items=[ConfigSecretVolumeItem(key="key", path="path", mode="0755")],
                 ),
             ],
-            extra_volumes=[ConfigVolume(host_path="/tmp", container_path="/nail/tmp", mode="RO",),],
+            extra_volumes=[
+                ConfigVolume(
+                    host_path="/tmp",
+                    container_path="/nail/tmp",
+                    mode="RO",
+                ),
+            ],
             trigger_downstreams=True,
             triggered_by=["foo.bar"],
         )

diff --git a/tron/config/schema.py b/tron/config/schema.py
@@ -233,11 +233,23 @@ def config_object_factory(name, required=None, optional=None):
     optional=[],
 )
 
-ConfigVolume = config_object_factory(name="ConfigVolume", required=["container_path", "host_path",], optional=["mode"],)
+ConfigVolume = config_object_factory(
+    name="ConfigVolume",
+    required=[
+        "container_path",
+        "host_path",
+    ],
+    optional=["mode"],
+)
 
 
 ConfigSecretVolumeItem = config_object_factory(
-    name="ConfigSecretVolumeItem", required=["key", "path",], optional=["mode"],
+    name="ConfigSecretVolumeItem",
+    required=[
+        "key",
+        "path",
+    ],
+    optional=["mode"],
 )
 
 
@@ -259,7 +271,11 @@ def _asdict(self) -> dict:
         return d
 
 
-ConfigSecretSource = config_object_factory(name="ConfigSecretSource", required=["secret_name", "key"], optional=[],)
+ConfigSecretSource = config_object_factory(
+    name="ConfigSecretSource",
+    required=["secret_name", "key"],
+    optional=[],
+)
 
 ConfigFieldSelectorSource = config_object_factory(
     name="ConfigFieldSelectorSource",